diff options
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-dbs/postgresql/files/0001-Use-pkg-config-for-libxml2-detection.patch')
| -rw-r--r-- | meta-openembedded/meta-oe/recipes-dbs/postgresql/files/0001-Use-pkg-config-for-libxml2-detection.patch | 30 |
1 files changed, 18 insertions, 12 deletions
diff --git a/meta-openembedded/meta-oe/recipes-dbs/postgresql/files/0001-Use-pkg-config-for-libxml2-detection.patch b/meta-openembedded/meta-oe/recipes-dbs/postgresql/files/0001-Use-pkg-config-for-libxml2-detection.patch index fafbc25a4..f14da06d9 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/postgresql/files/0001-Use-pkg-config-for-libxml2-detection.patch +++ b/meta-openembedded/meta-oe/recipes-dbs/postgresql/files/0001-Use-pkg-config-for-libxml2-detection.patch @@ -1,26 +1,29 @@ -From d52e330be895bb8c5f0fb3e2884766acbd942a85 Mon Sep 17 00:00:00 2001 -From: Philip Balister <philip@balister.org> -Date: Tue, 1 Jul 2014 09:40:44 -0400 -Subject: [PATCH] Use pkg-config for libxml2 detection. +From d3ee8c8df5808b63e86f40831f2ba62cbb33d291 Mon Sep 17 00:00:00 2001 +From: Changqing Li <changqing.li@windriver.com> +Date: Wed, 8 Aug 2018 09:18:27 +0800 +Subject: [PATCH] postgresql: Use pkg-config for libxml2 detection. Upstream-Status: Inappropriate [configuration] xml2-config does not work. Use pkgconfig to set CPPFLAGS and LIBS. Signed-off-by: Philip Balister <philip@balister.org> + +upate to version 10.4 +Signed-off-by: Changqing Li <changqing.li@windriver.com> --- configure.in | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) -Index: postgresql-9.4.20/configure.in -=================================================================== ---- postgresql-9.4.20.orig/configure.in -+++ postgresql-9.4.20/configure.in -@@ -789,19 +789,8 @@ PGAC_ARG_BOOL(with, libxml, no, [build w +diff --git a/configure.in b/configure.in +index d9fe56e..3e2cd3a 100644 +--- a/configure.in ++++ b/configure.in +@@ -816,19 +816,8 @@ PGAC_ARG_BOOL(with, libxml, no, [build with XML support], [AC_DEFINE([USE_LIBXML], 1, [Define to 1 to build with XML support. (--with-libxml)])]) if test "$with_libxml" = yes ; then -- AC_CHECK_PROGS(XML2_CONFIG, xml2-config) +- PGAC_PATH_PROGS(XML2_CONFIG, xml2-config) - if test -n "$XML2_CONFIG"; then - for pgac_option in `$XML2_CONFIG --cflags`; do - case $pgac_option in @@ -33,8 +36,11 @@ Index: postgresql-9.4.20/configure.in - esac - done - fi -+ CPPFLAGS="$CPPFLAGS `pkg-config --short-errors --print-errors --cflags "libxml-2.0" 2>&1`" -+ LIBS="`pkg-config --short-errors --print-errors --libs "libxml-2.0" 2>&1` $LIBS" ++ CPPFLAGS="$CPPFLAGS `pkg-config --short-errors --print-errors --cflags "libxml-2.0" 2>&1`" ++ LIBS="`pkg-config --short-errors --print-errors --libs "libxml-2.0" 2>&1` $LIBS" fi AC_SUBST(with_libxml) +-- +2.7.4 + |
