From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from plane.gmane.org (plane.gmane.org [80.91.229.3]) by mail.openembedded.org (Postfix) with ESMTP id 924177020E for ; Fri, 20 Jun 2014 09:52:26 +0000 (UTC) Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1WxvUf-0000QY-Br for openembedded-devel@lists.openembedded.org; Fri, 20 Jun 2014 11:52:25 +0200 Received: from ip4da2a5ae.direct-adsl.nl ([77.162.165.174]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 20 Jun 2014 11:52:25 +0200 Received: from koen by ip4da2a5ae.direct-adsl.nl with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 20 Jun 2014 11:52:25 +0200 X-Injected-Via-Gmane: http://gmane.org/ To: openembedded-devel@lists.openembedded.org From: Koen Kooi Date: Fri, 20 Jun 2014 11:52:11 +0200 Message-ID: References: <1403256454-4045-1-git-send-email-wenzong.fan@windriver.com> Mime-Version: 1.0 X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: ip4da2a5ae.direct-adsl.nl User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.9; rv:24.0) Gecko/20100101 Thunderbird/24.6.0 In-Reply-To: <1403256454-4045-1-git-send-email-wenzong.fan@windriver.com> X-Enigmail-Version: 1.6 Subject: Re: [meta-oe][PATCH] postgresql: Use pkg-config for libxml2 dependency X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list Reply-To: openembedded-devel@lists.openembedded.org List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Jun 2014 09:52:27 -0000 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 wenzong.fan@windriver.com schreef op 20-06-14 11:27: > From: Wenzong Fan > > Use pkg-config for the libxml2 dependency, not the -config script. > > Signed-off-by: Wenzong Fan --- > .../use-pkg-config-for-libxml2-dependency.patch | 44 > ++++++++++++++++++++ .../recipes-support/postgresql/postgresql_9.2.4.bb | > 1 + 2 files changed, 45 insertions(+) create mode 100644 > meta-oe/recipes-support/postgresql/postgresql-9.2.4/use-pkg-config-for-libxml2-dependency.patch > > diff --git > a/meta-oe/recipes-support/postgresql/postgresql-9.2.4/use-pkg-config-for-libxml2-dependency.patch > b/meta-oe/recipes-support/postgresql/postgresql-9.2.4/use-pkg-config-for-libxml2-dependency.patch > > new file mode 100644 > index 0000000..d26701f --- /dev/null +++ > b/meta-oe/recipes-support/postgresql/postgresql-9.2.4/use-pkg-config-for-libxml2-dependency.patch > > @@ -0,0 +1,44 @@ > +From 744bbd99a779deac244cebc30f21db9b77946eab Mon Sep 17 00:00:00 2001 > +From: Wenzong Fan +Date: Thu, 19 Jun 2014 > 22:34:21 -0400 +Subject: [PATCH] postgresql: Use pkg-config for libxml2 > dependency + +Use pkg-config for the libxml2 dependency, not the -config > script. + +Upstream-Status: Pending + +Signed-off-by: Wenzong Fan > +--- + configure.in | 16 ++++------------ + > 1 file changed, 4 insertions(+), 12 deletions(-) + +diff --git > a/configure.in b/configure.in +index 3bf9728..d768e9f 100644 +--- > a/configure.in ++++ b/configure.in +@@ -709,18 +709,10 @@ > 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 ++ PKG_CHECK_MODULES(PKG_XML2, [libxml-2.0],,) ++ if > test "x$PKG_XML2_CFLAGS" != "x"; then ++ CPPFLAGS="$CPPFLAGS > $PKG_XML2_CFLAGS" ++ LDFLAGS="$LDFLAGS $PKG_XML2_LIBS" + fi + fi + > +-- +1.7.9.5 Since you are dropping the pgac_* processing, could you add a note that you drooped it and why? regards, Koen > + diff --git a/meta-oe/recipes-support/postgresql/postgresql_9.2.4.bb > b/meta-oe/recipes-support/postgresql/postgresql_9.2.4.bb index > 49ca53f..e45638d 100644 --- > a/meta-oe/recipes-support/postgresql/postgresql_9.2.4.bb +++ > b/meta-oe/recipes-support/postgresql/postgresql_9.2.4.bb @@ -7,6 +7,7 @@ > PR = "${INC_PR}.0" SRC_URI += "\ > file://remove.autoconf.version.check.patch \ > file://ecpg-parallel-make-fix.patch \ + > file://use-pkg-config-for-libxml2-dependency.patch \ " > > SRC_URI[md5sum] = "6ee5bb53b97da7c6ad9cb0825d3300dd" > -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5 (Darwin) Comment: GPGTools - http://gpgtools.org iD8DBQFTpARLMkyGM64RGpERAg9hAJ98vjW1rta+ZUF+m/UepLYek9URCQCfW+f1 1i2dZoiq7OpvAgfIZ4E7n/o= =MDCo -----END PGP SIGNATURE-----