diff options
| author |   Joe Slater <jslater@windriver.com> | 2015-07-14 10:45:09 -0700 |
|---|---|---|
| committer |   Martin Jansa <Martin.Jansa@gmail.com> | 2015-07-30 21:00:27 +0200 |
| commit | fc54af99cb04669583a4f9a8f502f68f1f147c78 (patch) | |
| tree | 079718a3f8b5da222e55a4b301498eb1ab161357 /meta-oe/recipes-support/postgresql/files | |
| parent | 09a36b234c05a65e1acac3617da0a3521895dccf (diff) | |
| download | meta-openembedded-contrib-fc54af99cb04669583a4f9a8f502f68f1f147c78.tar.gz | |
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>
Diffstat (limited to 'meta-oe/recipes-support/postgresql/files')
3 files changed, 47 insertions, 12 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/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 <rongqing.li@windriver.com> +--- + 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 <perl.h> +-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 <perl.h> 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) + |