[oe-commits] Tim Orling : python-lxml: fix pkg-config for libxml2 and libxslt

[git at git.openembedded.org]

Module: meta-openembedded.git
Branch: master
Commit: a6423360a175a5e8515c0c6f97d711850dc96c53
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=a6423360a175a5e8515c0c6f97d711850dc96c53

Author: Tim Orling <ticotimo at gmail.com>
Date:   Sat Sep 12 12:09:39 2015 -0700

python-lxml: fix pkg-config for libxml2 and libxslt

Signed-off-by: Tim Orling <TicoTimo at gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 meta-python/recipes-devtools/python/python-lxml.inc | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/meta-python/recipes-devtools/python/python-lxml.inc b/meta-python/recipes-devtools/python/python-lxml.inc
index 9d1bfbc..8ca8f41 100644
--- a/meta-python/recipes-devtools/python/python-lxml.inc
+++ b/meta-python/recipes-devtools/python/python-lxml.inc
@@ -16,15 +16,19 @@ SRC_URI[sha256sum] = "b3d362bac471172747cda3513238f115cbd6c5f8b8e6319bf6a97a7892
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 DISTUTILS_BUILD_ARGS += " \
-                     --with-xslt-config='${STAGING_BINDIR_NATIVE}/pkg-config libxslt' \
-                     --with-xml2-config='${STAGING_BINDIR_CROSS}/pkg-config libxml2' \
+                     --with-xslt-config='pkg-config libxslt' \
+                     --with-xml2-config='pkg-config libxml-2.0' \
 "
 
 DISTUTILS_INSTALL_ARGS += " \
-                     --with-xslt-config='${STAGING_BINDIR_NATIVE}/pkg-config libxslt' \
-                     --with-xml2-config='${STAGING_BINDIR_CROSS}/pkg-config libxml2' \
+                     --with-xslt-config='pkg-config libxslt' \
+                     --with-xml2-config='pkg-config libxml-2.0' \
 "
 
+do_configure_prepend() {
+    sed -i -e 's/--version/--modversion/' ${B}/setupinfo.py
+}
+
 BBCLASSEXTEND = "native nativesdk"
 
 RDEPENDS_${PN} += "libxml2 libxslt ${PYTHON_PN}-compression"