diff options
Diffstat (limited to 'meta/recipes-core/libxml/libxml2.inc')
-rw-r--r-- | meta/recipes-core/libxml/libxml2.inc | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/meta/recipes-core/libxml/libxml2.inc b/meta/recipes-core/libxml/libxml2.inc index 60bb6b8539..1401c731b8 100644 --- a/meta/recipes-core/libxml/libxml2.inc +++ b/meta/recipes-core/libxml/libxml2.inc @@ -19,6 +19,7 @@ SRC_URI = "ftp://xmlsoft.org/libxml2/libxml2-${PV}.tar.gz;name=libtar \ file://runtest.patch \ file://run-ptest \ file://libxml2-CVE-2014-0191-fix.patch \ + file://python-sitepackages-dir.patch \ " inherit autotools pkgconfig binconfig pythonnative ptest @@ -30,6 +31,11 @@ do_configure_prepend () { sed -i -e '/.*ansidecl.h.*/d' ${S}/configure.in } +do_configure_prepend_class-nativesdk () { + # Ensure we get the correct site-packages path + export PYTHON_SITE_PACKAGES="${PYTHON_SITEPACKAGES_DIR}" +} + EXTRA_OECONF = "--without-python --without-debug --without-legacy --without-catalog --without-docbook --with-c14n --without-lzma --with-fexceptions" EXTRA_OECONF_class-native = "--with-python=${STAGING_BINDIR}/python --without-legacy --with-catalog --without-docbook --with-c14n --without-lzma" EXTRA_OECONF_class-nativesdk = "--with-python=${STAGING_BINDIR}/python --without-legacy --with-catalog --without-docbook --with-c14n --without-lzma" @@ -49,10 +55,13 @@ python populate_packages_prepend () { d.setVar('PKG_libxml2', '${MLPREFIX}libxml2') } -PACKAGES += "${PN}-utils" +PACKAGES += "${PN}-utils ${PN}-python" +FILES_${PN}-dbg += "${PYTHON_SITEPACKAGES_DIR}/.debug" +FILES_${PN}-staticdev += "${PYTHON_SITEPACKAGES_DIR}/*.a" FILES_${PN}-dev += "${libdir}/xml2Conf.sh" FILES_${PN}-utils += "${bindir}/*" +FILES_${PN}-python += "${PYTHON_SITEPACKAGES_DIR}" do_install_ptest () { cp -r ${WORKDIR}/xmlconf ${D}${PTEST_PATH} |