aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoe Slater <jslater@windriver.com>2015-07-14 10:45:09 -0700
committerMartin Jansa <Martin.Jansa@gmail.com>2015-07-30 21:00:27 +0200
commitfc54af99cb04669583a4f9a8f502f68f1f147c78 (patch)
tree079718a3f8b5da222e55a4b301498eb1ab161357
parent09a36b234c05a65e1acac3617da0a3521895dccf (diff)
downloadmeta-openembedded-contrib-fc54af99cb04669583a4f9a8f502f68f1f147c78.tar.gz
meta-openembedded-contrib-fc54af99cb04669583a4f9a8f502f68f1f147c78.tar.bz2
meta-openembedded-contrib-fc54af99cb04669583a4f9a8f502f68f1f147c78.zip
postgresql: advance from 9.4.2 to 9.4.4
Consolidate patches in one directory and remove two unused patches. Signed-off-by: Joe Slater <jslater@windriver.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r--meta-oe/recipes-support/postgresql/files/no-ecpg-test.patch12
-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.patch31
-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 @@
-diff --git a/src/interfaces/ecpg/Makefile b/src/interfaces/ecpg/Makefile
-index dcd578f..1428423 100644
---- a/src/interfaces/ecpg/Makefile
-+++ b/src/interfaces/ecpg/Makefile
-@@ -8,7 +8,6 @@ all install installdirs uninstall dep depend distprep:
- $(MAKE) -C ecpglib $@
- $(MAKE) -C compatlib $@
- $(MAKE) -C preproc $@
-- $(MAKE) -C test $@
-
- clean distclean maintainer-clean:
- -$(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 @@
-Upstream-status: backport
-
-From 602070f9cce790debd8d1469254e7726ab499ae7 Mon Sep 17 00:00:00 2001
-From: Peter Eisentraut <peter_e@gmx.net>
-Date: Fri, 29 Mar 2013 21:39:55 -0400
-Subject: [PATCH] ecpg: Parallel make fix
-
-In some parallel make situations, the install-headers target could be
-called before the installation directories are created by installdirs,
-causing the installation to fail. Fix that by making install-headers
-depend on installdirs.
----
- src/interfaces/ecpg/include/Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/interfaces/ecpg/include/Makefile b/src/interfaces/ecpg/include/Makefile
-index eab833b..e92e56f 100644
---- a/src/interfaces/ecpg/include/Makefile
-+++ b/src/interfaces/ecpg/include/Makefile
-@@ -18,7 +18,7 @@ ecpg_headers = ecpgerrno.h ecpglib.h ecpgtype.h sqlca.h sql3types.h ecpg_informi
- sqlda.h sqlda-compat.h sqlda-native.h
- informix_headers = datetime.h decimal.h sqltypes.h
-
--install-headers: $(ecpg_headers) $(informix_headers)
-+install-headers: $(ecpg_headers) $(informix_headers) installdirs
- $(INSTALL_DATA) $(addprefix $(srcdir)/,$(ecpg_headers)) '$(DESTDIR)$(includedir)/'
- $(INSTALL_DATA) $(addprefix $(srcdir)/,$(informix_headers)) '$(DESTDIR)$(informix_esql_dir)/'
- $(INSTALL_DATA) $(ecpg_config_h) '$(DESTDIR)$(includedir)'
---
-1.8.3.4
-
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 += "\
file://not-check-libperl.patch \
"
-SRC_URI[md5sum] = "b6369156607a4fd88f21af6fec0f30b9"
-SRC_URI[sha256sum] = "81fda191c165ba1d25d75cd0166ece5abdcb4a7f5eca01b349371e279ebb4d11"
+SRC_URI[md5sum] = "1fe952c44ed26d7e6a335cf991a9c1c6"
+SRC_URI[sha256sum] = "538ed99688d6fdbec6fd166d1779cf4588bf2f16c52304e5ef29f904c43b0013"
+