From fc54af99cb04669583a4f9a8f502f68f1f147c78 Mon Sep 17 00:00:00 2001 From: Joe Slater Date: Tue, 14 Jul 2015 10:45:09 -0700 Subject: 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 Signed-off-by: Martin Jansa --- .../postgresql/files/no-ecpg-test.patch | 12 --------- .../postgresql/files/not-check-libperl.patch | 31 ++++++++++++++++++++++ .../files/remove.autoconf.version.check.patch | 16 +++++++++++ .../postgresql-9.4.2/ecpg-parallel-make-fix.patch | 31 ---------------------- .../postgresql-9.4.2/not-check-libperl.patch | 31 ---------------------- .../remove.autoconf.version.check.patch | 16 ----------- .../recipes-support/postgresql/postgresql_9.4.2.bb | 13 --------- .../recipes-support/postgresql/postgresql_9.4.4.bb | 14 ++++++++++ 8 files changed, 61 insertions(+), 103 deletions(-) delete mode 100644 meta-oe/recipes-support/postgresql/files/no-ecpg-test.patch create mode 100644 meta-oe/recipes-support/postgresql/files/not-check-libperl.patch create mode 100644 meta-oe/recipes-support/postgresql/files/remove.autoconf.version.check.patch delete mode 100644 meta-oe/recipes-support/postgresql/postgresql-9.4.2/ecpg-parallel-make-fix.patch delete mode 100644 meta-oe/recipes-support/postgresql/postgresql-9.4.2/not-check-libperl.patch delete mode 100644 meta-oe/recipes-support/postgresql/postgresql-9.4.2/remove.autoconf.version.check.patch delete mode 100644 meta-oe/recipes-support/postgresql/postgresql_9.4.2.bb create mode 100644 meta-oe/recipes-support/postgresql/postgresql_9.4.4.bb 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/files/not-check-libperl.patch b/meta-oe/recipes-support/postgresql/files/not-check-libperl.patch new file mode 100644 index 0000000000..e199f39143 --- /dev/null +++ b/meta-oe/recipes-support/postgresql/files/not-check-libperl.patch @@ -0,0 +1,31 @@ +[PATCH] not check libperl under cross compiling + +Upstream-Status: Inappropriate [configuration] + +libperl ldflags returned by PGAC_CHECK_PERL_EMBED_LDFLAGS are native, +can not be used to check target library. + +postpresql has the dependency on perl, so not need to check libperl +again, like in postgresql-9.2.4 + +Signed-off-by: Roy Li +--- + configure.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.in b/configure.in +index ae1a5a0..9a0970d 100644 +--- a/configure.in ++++ b/configure.in +@@ -1877,7 +1877,7 @@ if test "$with_tcl" = yes; then + fi + + # check for +-if test "$with_perl" = yes; then ++if test "$with_perl" = yes && test "$cross_compiling" = no; then + ac_save_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$CPPFLAGS -I$perl_archlibexp/CORE" + AC_CHECK_HEADER(perl.h, [], [AC_MSG_ERROR([header file is required for Perl])], +-- +1.9.1 + diff --git a/meta-oe/recipes-support/postgresql/files/remove.autoconf.version.check.patch b/meta-oe/recipes-support/postgresql/files/remove.autoconf.version.check.patch new file mode 100644 index 0000000000..be23fd419d --- /dev/null +++ b/meta-oe/recipes-support/postgresql/files/remove.autoconf.version.check.patch @@ -0,0 +1,16 @@ +Index: postgresql-9.2.4/configure.in +=================================================================== +--- postgresql-9.2.4.orig/configure.in ++++ postgresql-9.2.4/configure.in +@@ -19,10 +19,6 @@ m4_pattern_forbid(^PGAC_)dnl to catch un + + AC_INIT([PostgreSQL], [9.4.2], [pgsql-bugs@postgresql.org]) + +-m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.69], [], [m4_fatal([Autoconf version 2.69 is required. +-Untested combinations of 'autoconf' and PostgreSQL versions are not +-recommended. You can remove the check from 'configure.in' but it is then +-your responsibility whether the result works or not.])]) + AC_COPYRIGHT([Copyright (c) 1996-2014, PostgreSQL Global Development Group]) + AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c]) + AC_CONFIG_AUX_DIR(config) + 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 -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/not-check-libperl.patch b/meta-oe/recipes-support/postgresql/postgresql-9.4.2/not-check-libperl.patch deleted file mode 100644 index e199f39143..0000000000 --- a/meta-oe/recipes-support/postgresql/postgresql-9.4.2/not-check-libperl.patch +++ /dev/null @@ -1,31 +0,0 @@ -[PATCH] not check libperl under cross compiling - -Upstream-Status: Inappropriate [configuration] - -libperl ldflags returned by PGAC_CHECK_PERL_EMBED_LDFLAGS are native, -can not be used to check target library. - -postpresql has the dependency on perl, so not need to check libperl -again, like in postgresql-9.2.4 - -Signed-off-by: Roy Li ---- - configure.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.in b/configure.in -index ae1a5a0..9a0970d 100644 ---- a/configure.in -+++ b/configure.in -@@ -1877,7 +1877,7 @@ if test "$with_tcl" = yes; then - fi - - # check for --if test "$with_perl" = yes; then -+if test "$with_perl" = yes && test "$cross_compiling" = no; then - ac_save_CPPFLAGS=$CPPFLAGS - CPPFLAGS="$CPPFLAGS -I$perl_archlibexp/CORE" - AC_CHECK_HEADER(perl.h, [], [AC_MSG_ERROR([header file is required for Perl])], --- -1.9.1 - diff --git a/meta-oe/recipes-support/postgresql/postgresql-9.4.2/remove.autoconf.version.check.patch b/meta-oe/recipes-support/postgresql/postgresql-9.4.2/remove.autoconf.version.check.patch deleted file mode 100644 index be23fd419d..0000000000 --- a/meta-oe/recipes-support/postgresql/postgresql-9.4.2/remove.autoconf.version.check.patch +++ /dev/null @@ -1,16 +0,0 @@ -Index: postgresql-9.2.4/configure.in -=================================================================== ---- postgresql-9.2.4.orig/configure.in -+++ postgresql-9.2.4/configure.in -@@ -19,10 +19,6 @@ m4_pattern_forbid(^PGAC_)dnl to catch un - - AC_INIT([PostgreSQL], [9.4.2], [pgsql-bugs@postgresql.org]) - --m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.69], [], [m4_fatal([Autoconf version 2.69 is required. --Untested combinations of 'autoconf' and PostgreSQL versions are not --recommended. You can remove the check from 'configure.in' but it is then --your responsibility whether the result works or not.])]) - AC_COPYRIGHT([Copyright (c) 1996-2014, PostgreSQL Global Development Group]) - AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c]) - AC_CONFIG_AUX_DIR(config) - diff --git a/meta-oe/recipes-support/postgresql/postgresql_9.4.2.bb b/meta-oe/recipes-support/postgresql/postgresql_9.4.2.bb deleted file mode 100644 index 1dee1624b5..0000000000 --- a/meta-oe/recipes-support/postgresql/postgresql_9.4.2.bb +++ /dev/null @@ -1,13 +0,0 @@ -require postgresql.inc - -LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=7d847a9b446ddfe187acfac664189672" - -PR = "${INC_PR}.0" - -SRC_URI += "\ - file://remove.autoconf.version.check.patch \ - file://not-check-libperl.patch \ -" - -SRC_URI[md5sum] = "b6369156607a4fd88f21af6fec0f30b9" -SRC_URI[sha256sum] = "81fda191c165ba1d25d75cd0166ece5abdcb4a7f5eca01b349371e279ebb4d11" diff --git a/meta-oe/recipes-support/postgresql/postgresql_9.4.4.bb b/meta-oe/recipes-support/postgresql/postgresql_9.4.4.bb new file mode 100644 index 0000000000..266206ba4a --- /dev/null +++ b/meta-oe/recipes-support/postgresql/postgresql_9.4.4.bb @@ -0,0 +1,14 @@ +require postgresql.inc + +LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=7d847a9b446ddfe187acfac664189672" + +PR = "${INC_PR}.0" + +SRC_URI += "\ + file://remove.autoconf.version.check.patch \ + file://not-check-libperl.patch \ +" + +SRC_URI[md5sum] = "1fe952c44ed26d7e6a335cf991a9c1c6" +SRC_URI[sha256sum] = "538ed99688d6fdbec6fd166d1779cf4588bf2f16c52304e5ef29f904c43b0013" + -- cgit 1.2.3-korg