diff options
3 files changed, 14 insertions, 21 deletions
diff --git a/meta-oe/recipes-dbs/postgresql/files/0001-Use-pkg-config-for-libxml2-detection.patch b/meta-oe/recipes-dbs/postgresql/files/0001-Use-pkg-config-for-libxml2-detection.patch index d08ec6af1d..ce2a60cabf 100644 --- a/meta-oe/recipes-dbs/postgresql/files/0001-Use-pkg-config-for-libxml2-detection.patch +++ b/meta-oe/recipes-dbs/postgresql/files/0001-Use-pkg-config-for-libxml2-detection.patch | |||
@@ -12,11 +12,11 @@ Signed-off-by: Philip Balister <philip@balister.org> | |||
12 | configure.in | 15 ++------------- | 12 | configure.in | 15 ++------------- |
13 | 1 file changed, 2 insertions(+), 13 deletions(-) | 13 | 1 file changed, 2 insertions(+), 13 deletions(-) |
14 | 14 | ||
15 | diff --git a/configure.in b/configure.in | 15 | Index: postgresql-9.4.15/configure.in |
16 | index f8bf466..1f4fabf 100644 | 16 | =================================================================== |
17 | --- a/configure.in | 17 | --- postgresql-9.4.15.orig/configure.in |
18 | +++ b/configure.in | 18 | +++ postgresql-9.4.15/configure.in |
19 | @@ -734,19 +734,8 @@ PGAC_ARG_BOOL(with, libxml, no, [build with XML support], | 19 | @@ -759,19 +759,8 @@ PGAC_ARG_BOOL(with, libxml, no, [build w |
20 | [AC_DEFINE([USE_LIBXML], 1, [Define to 1 to build with XML support. (--with-libxml)])]) | 20 | [AC_DEFINE([USE_LIBXML], 1, [Define to 1 to build with XML support. (--with-libxml)])]) |
21 | 21 | ||
22 | if test "$with_libxml" = yes ; then | 22 | if test "$with_libxml" = yes ; then |
@@ -38,6 +38,3 @@ index f8bf466..1f4fabf 100644 | |||
38 | fi | 38 | fi |
39 | 39 | ||
40 | AC_SUBST(with_libxml) | 40 | AC_SUBST(with_libxml) |
41 | -- | ||
42 | 1.8.3.1 | ||
43 | |||
diff --git a/meta-oe/recipes-dbs/postgresql/files/not-check-libperl.patch b/meta-oe/recipes-dbs/postgresql/files/not-check-libperl.patch index e199f39143..971510943d 100644 --- a/meta-oe/recipes-dbs/postgresql/files/not-check-libperl.patch +++ b/meta-oe/recipes-dbs/postgresql/files/not-check-libperl.patch | |||
@@ -13,11 +13,11 @@ Signed-off-by: Roy Li <rongqing.li@windriver.com> | |||
13 | configure.in | 2 +- | 13 | configure.in | 2 +- |
14 | 1 file changed, 1 insertion(+), 1 deletion(-) | 14 | 1 file changed, 1 insertion(+), 1 deletion(-) |
15 | 15 | ||
16 | diff --git a/configure.in b/configure.in | 16 | Index: postgresql-9.4.15/configure.in |
17 | index ae1a5a0..9a0970d 100644 | 17 | =================================================================== |
18 | --- a/configure.in | 18 | --- postgresql-9.4.15.orig/configure.in |
19 | +++ b/configure.in | 19 | +++ postgresql-9.4.15/configure.in |
20 | @@ -1877,7 +1877,7 @@ if test "$with_tcl" = yes; then | 20 | @@ -1879,7 +1879,7 @@ if test "$with_tcl" = yes; then |
21 | fi | 21 | fi |
22 | 22 | ||
23 | # check for <perl.h> | 23 | # check for <perl.h> |
@@ -26,6 +26,3 @@ index ae1a5a0..9a0970d 100644 | |||
26 | ac_save_CPPFLAGS=$CPPFLAGS | 26 | ac_save_CPPFLAGS=$CPPFLAGS |
27 | CPPFLAGS="$CPPFLAGS -I$perl_archlibexp/CORE" | 27 | CPPFLAGS="$CPPFLAGS -I$perl_archlibexp/CORE" |
28 | AC_CHECK_HEADER(perl.h, [], [AC_MSG_ERROR([header file <perl.h> is required for Perl])], | 28 | AC_CHECK_HEADER(perl.h, [], [AC_MSG_ERROR([header file <perl.h> is required for Perl])], |
29 | -- | ||
30 | 1.9.1 | ||
31 | |||
diff --git a/meta-oe/recipes-dbs/postgresql/files/remove.autoconf.version.check.patch b/meta-oe/recipes-dbs/postgresql/files/remove.autoconf.version.check.patch index be23fd419d..be82f10313 100644 --- a/meta-oe/recipes-dbs/postgresql/files/remove.autoconf.version.check.patch +++ b/meta-oe/recipes-dbs/postgresql/files/remove.autoconf.version.check.patch | |||
@@ -1,10 +1,10 @@ | |||
1 | Index: postgresql-9.2.4/configure.in | 1 | Index: postgresql-9.4.15/configure.in |
2 | =================================================================== | 2 | =================================================================== |
3 | --- postgresql-9.2.4.orig/configure.in | 3 | --- postgresql-9.4.15.orig/configure.in |
4 | +++ postgresql-9.2.4/configure.in | 4 | +++ postgresql-9.4.15/configure.in |
5 | @@ -19,10 +19,6 @@ m4_pattern_forbid(^PGAC_)dnl to catch un | 5 | @@ -19,10 +19,6 @@ m4_pattern_forbid(^PGAC_)dnl to catch un |
6 | 6 | ||
7 | AC_INIT([PostgreSQL], [9.4.2], [pgsql-bugs@postgresql.org]) | 7 | AC_INIT([PostgreSQL], [9.4.15], [pgsql-bugs@postgresql.org]) |
8 | 8 | ||
9 | -m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.69], [], [m4_fatal([Autoconf version 2.69 is required. | 9 | -m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.69], [], [m4_fatal([Autoconf version 2.69 is required. |
10 | -Untested combinations of 'autoconf' and PostgreSQL versions are not | 10 | -Untested combinations of 'autoconf' and PostgreSQL versions are not |
@@ -13,4 +13,3 @@ Index: postgresql-9.2.4/configure.in | |||
13 | AC_COPYRIGHT([Copyright (c) 1996-2014, PostgreSQL Global Development Group]) | 13 | AC_COPYRIGHT([Copyright (c) 1996-2014, PostgreSQL Global Development Group]) |
14 | AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c]) | 14 | AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c]) |
15 | AC_CONFIG_AUX_DIR(config) | 15 | AC_CONFIG_AUX_DIR(config) |
16 | |||