On 07/01/2014 12:03 PM, Martin Jansa wrote: > On Tue, Jul 01, 2014 at 10:27:33AM -0400, Philip Balister wrote: >> Use package-config instead of binconfig for libxml-2.0. >> >> Signed-off-by: Philip Balister <phi...@balister.org> >> --- >> ...0001-Use-pkg-config-for-libxml2-detection.patch | 43 >> ++++++++++++++++++++++ >> meta-oe/recipes-support/postgresql/postgresql.inc | 1 + >> 2 files changed, 44 insertions(+) >> create mode 100644 >> meta-oe/recipes-support/postgresql/files/0001-Use-pkg-config-for-libxml2-detection.patch >> >> diff --git >> a/meta-oe/recipes-support/postgresql/files/0001-Use-pkg-config-for-libxml2-detection.patch >> >> b/meta-oe/recipes-support/postgresql/files/0001-Use-pkg-config-for-libxml2-detection.patch >> new file mode 100644 >> index 0000000..d08ec6a >> --- /dev/null >> +++ >> b/meta-oe/recipes-support/postgresql/files/0001-Use-pkg-config-for-libxml2-detection.patch >> @@ -0,0 +1,43 @@ >> +From d52e330be895bb8c5f0fb3e2884766acbd942a85 Mon Sep 17 00:00:00 2001 >> +From: Philip Balister <phi...@balister.org> >> +Date: Tue, 1 Jul 2014 09:40:44 -0400 >> +Subject: [PATCH] Use pkg-config for libxml2 detection. >> + >> +Upstream-Status: Inappropriate [configuration] > > What's relation to this change? > http://patchwork.openembedded.org/patch/74159/ > > Upstream-Status value doesn't seem right and your change is also > dropping pgac_* as Koen commented before.
I need to remember to check the list archives before fixing these things. Wenzong, do you want to update your patch, or should I update mine? Philip > >> + >> +xml2-config does not work. Use pkgconfig to set CPPFLAGS and LIBS. >> + >> +Signed-off-by: Philip Balister <phi...@balister.org> >> +--- >> + configure.in | 15 ++------------- >> + 1 file changed, 2 insertions(+), 13 deletions(-) >> + >> +diff --git a/configure.in b/configure.in >> +index f8bf466..1f4fabf 100644 >> +--- a/configure.in >> ++++ b/configure.in >> +@@ -734,19 +734,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) >> +- if test -n "$XML2_CONFIG"; then >> +- for pgac_option in `$XML2_CONFIG --cflags`; do >> +- case $pgac_option in >> +- -I*|-D*) CPPFLAGS="$CPPFLAGS $pgac_option";; >> +- esac >> +- done >> +- for pgac_option in `$XML2_CONFIG --libs`; do >> +- case $pgac_option in >> +- -L*) LDFLAGS="$LDFLAGS $pgac_option";; >> +- 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" >> + fi >> + >> + AC_SUBST(with_libxml) >> +-- >> +1.8.3.1 >> + >> diff --git a/meta-oe/recipes-support/postgresql/postgresql.inc >> b/meta-oe/recipes-support/postgresql/postgresql.inc >> index 4e5ec02..79d1281 100644 >> --- a/meta-oe/recipes-support/postgresql/postgresql.inc >> +++ b/meta-oe/recipes-support/postgresql/postgresql.inc >> @@ -28,6 +28,7 @@ SRC_URI = >> "http://ftp.postgresql.org/pub/source/v${PV}/${BP}.tar.bz2 \ >> file://postgresql.init \ >> file://postgresql-bashprofile \ >> file://postgresql.pam \ >> + file://0001-Use-pkg-config-for-libxml2-detection.patch \ >> " >> >> LEAD_SONAME = "libpq.so" >> -- >> 1.8.3.1 >> >> -- >> _______________________________________________ >> Openembedded-devel mailing list >> Openembedded-devel@lists.openembedded.org >> http://lists.openembedded.org/mailman/listinfo/openembedded-devel > > >
signature.asc
Description: OpenPGP digital signature
-- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
