diff options
-rw-r--r-- | meta-oe/recipes-support/postgresql/files/no-ecpg-test.patch | 12 | ||||
-rw-r--r-- | meta-oe/recipes-support/postgresql/files/not-check-libperl.patch (renamed from meta-oe/recipes-support/postgresql/postgresql-9.4.2/not-check-libperl.patch) | 0 | ||||
-rw-r--r-- | meta-oe/recipes-support/postgresql/files/remove.autoconf.version.check.patch (renamed from meta-oe/recipes-support/postgresql/postgresql-9.4.2/remove.autoconf.version.check.patch) | 0 | ||||
-rw-r--r-- | meta-oe/recipes-support/postgresql/postgresql-9.4.2/ecpg-parallel-make-fix.patch | 31 | ||||
-rw-r--r-- | meta-oe/recipes-support/postgresql/postgresql_9.4.4.bb (renamed from meta-oe/recipes-support/postgresql/postgresql_9.4.2.bb) | 5 |
5 files changed, 3 insertions, 45 deletions
diff --git a/meta-oe/recipes-support/postgresql/files/no-ecpg-test.patch b/meta-oe/recipes-support/postgresql/files/no-ecpg-test.patch deleted file mode 100644 index c0f28f4258..0000000000 --- a/meta-oe/recipes-support/postgresql/files/no-ecpg-test.patch +++ /dev/null | |||
@@ -1,12 +0,0 @@ | |||
1 | diff --git a/src/interfaces/ecpg/Makefile b/src/interfaces/ecpg/Makefile | ||
2 | index dcd578f..1428423 100644 | ||
3 | --- a/src/interfaces/ecpg/Makefile | ||
4 | +++ b/src/interfaces/ecpg/Makefile | ||
5 | @@ -8,7 +8,6 @@ all install installdirs uninstall dep depend distprep: | ||
6 | $(MAKE) -C ecpglib $@ | ||
7 | $(MAKE) -C compatlib $@ | ||
8 | $(MAKE) -C preproc $@ | ||
9 | - $(MAKE) -C test $@ | ||
10 | |||
11 | clean distclean maintainer-clean: | ||
12 | -$(MAKE) -C include $@ | ||
diff --git a/meta-oe/recipes-support/postgresql/postgresql-9.4.2/not-check-libperl.patch b/meta-oe/recipes-support/postgresql/files/not-check-libperl.patch index e199f39143..e199f39143 100644 --- a/meta-oe/recipes-support/postgresql/postgresql-9.4.2/not-check-libperl.patch +++ b/meta-oe/recipes-support/postgresql/files/not-check-libperl.patch | |||
diff --git a/meta-oe/recipes-support/postgresql/postgresql-9.4.2/remove.autoconf.version.check.patch b/meta-oe/recipes-support/postgresql/files/remove.autoconf.version.check.patch index be23fd419d..be23fd419d 100644 --- a/meta-oe/recipes-support/postgresql/postgresql-9.4.2/remove.autoconf.version.check.patch +++ b/meta-oe/recipes-support/postgresql/files/remove.autoconf.version.check.patch | |||
diff --git a/meta-oe/recipes-support/postgresql/postgresql-9.4.2/ecpg-parallel-make-fix.patch b/meta-oe/recipes-support/postgresql/postgresql-9.4.2/ecpg-parallel-make-fix.patch deleted file mode 100644 index 63615cd517..0000000000 --- a/meta-oe/recipes-support/postgresql/postgresql-9.4.2/ecpg-parallel-make-fix.patch +++ /dev/null | |||
@@ -1,31 +0,0 @@ | |||
1 | Upstream-status: backport | ||
2 | |||
3 | From 602070f9cce790debd8d1469254e7726ab499ae7 Mon Sep 17 00:00:00 2001 | ||
4 | From: Peter Eisentraut <peter_e@gmx.net> | ||
5 | Date: Fri, 29 Mar 2013 21:39:55 -0400 | ||
6 | Subject: [PATCH] ecpg: Parallel make fix | ||
7 | |||
8 | In some parallel make situations, the install-headers target could be | ||
9 | called before the installation directories are created by installdirs, | ||
10 | causing the installation to fail. Fix that by making install-headers | ||
11 | depend on installdirs. | ||
12 | --- | ||
13 | src/interfaces/ecpg/include/Makefile | 2 +- | ||
14 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
15 | |||
16 | diff --git a/src/interfaces/ecpg/include/Makefile b/src/interfaces/ecpg/include/Makefile | ||
17 | index eab833b..e92e56f 100644 | ||
18 | --- a/src/interfaces/ecpg/include/Makefile | ||
19 | +++ b/src/interfaces/ecpg/include/Makefile | ||
20 | @@ -18,7 +18,7 @@ ecpg_headers = ecpgerrno.h ecpglib.h ecpgtype.h sqlca.h sql3types.h ecpg_informi | ||
21 | sqlda.h sqlda-compat.h sqlda-native.h | ||
22 | informix_headers = datetime.h decimal.h sqltypes.h | ||
23 | |||
24 | -install-headers: $(ecpg_headers) $(informix_headers) | ||
25 | +install-headers: $(ecpg_headers) $(informix_headers) installdirs | ||
26 | $(INSTALL_DATA) $(addprefix $(srcdir)/,$(ecpg_headers)) '$(DESTDIR)$(includedir)/' | ||
27 | $(INSTALL_DATA) $(addprefix $(srcdir)/,$(informix_headers)) '$(DESTDIR)$(informix_esql_dir)/' | ||
28 | $(INSTALL_DATA) $(ecpg_config_h) '$(DESTDIR)$(includedir)' | ||
29 | -- | ||
30 | 1.8.3.4 | ||
31 | |||
diff --git a/meta-oe/recipes-support/postgresql/postgresql_9.4.2.bb b/meta-oe/recipes-support/postgresql/postgresql_9.4.4.bb index 1dee1624b5..266206ba4a 100644 --- a/meta-oe/recipes-support/postgresql/postgresql_9.4.2.bb +++ b/meta-oe/recipes-support/postgresql/postgresql_9.4.4.bb | |||
@@ -9,5 +9,6 @@ SRC_URI += "\ | |||
9 | file://not-check-libperl.patch \ | 9 | file://not-check-libperl.patch \ |
10 | " | 10 | " |
11 | 11 | ||
12 | SRC_URI[md5sum] = "b6369156607a4fd88f21af6fec0f30b9" | 12 | SRC_URI[md5sum] = "1fe952c44ed26d7e6a335cf991a9c1c6" |
13 | SRC_URI[sha256sum] = "81fda191c165ba1d25d75cd0166ece5abdcb4a7f5eca01b349371e279ebb4d11" | 13 | SRC_URI[sha256sum] = "538ed99688d6fdbec6fd166d1779cf4588bf2f16c52304e5ef29f904c43b0013" |
14 | |||