summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/libxml/libxml2.inc
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-core/libxml/libxml2.inc')
-rw-r--r--meta/recipes-core/libxml/libxml2.inc11
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 \
19 file://runtest.patch \ 19 file://runtest.patch \
20 file://run-ptest \ 20 file://run-ptest \
21 file://libxml2-CVE-2014-0191-fix.patch \ 21 file://libxml2-CVE-2014-0191-fix.patch \
22 file://python-sitepackages-dir.patch \
22 " 23 "
23 24
24inherit autotools pkgconfig binconfig pythonnative ptest 25inherit autotools pkgconfig binconfig pythonnative ptest
@@ -30,6 +31,11 @@ do_configure_prepend () {
30 sed -i -e '/.*ansidecl.h.*/d' ${S}/configure.in 31 sed -i -e '/.*ansidecl.h.*/d' ${S}/configure.in
31} 32}
32 33
34do_configure_prepend_class-nativesdk () {
35 # Ensure we get the correct site-packages path
36 export PYTHON_SITE_PACKAGES="${PYTHON_SITEPACKAGES_DIR}"
37}
38
33EXTRA_OECONF = "--without-python --without-debug --without-legacy --without-catalog --without-docbook --with-c14n --without-lzma --with-fexceptions" 39EXTRA_OECONF = "--without-python --without-debug --without-legacy --without-catalog --without-docbook --with-c14n --without-lzma --with-fexceptions"
34EXTRA_OECONF_class-native = "--with-python=${STAGING_BINDIR}/python --without-legacy --with-catalog --without-docbook --with-c14n --without-lzma" 40EXTRA_OECONF_class-native = "--with-python=${STAGING_BINDIR}/python --without-legacy --with-catalog --without-docbook --with-c14n --without-lzma"
35EXTRA_OECONF_class-nativesdk = "--with-python=${STAGING_BINDIR}/python --without-legacy --with-catalog --without-docbook --with-c14n --without-lzma" 41EXTRA_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 () {
49 d.setVar('PKG_libxml2', '${MLPREFIX}libxml2') 55 d.setVar('PKG_libxml2', '${MLPREFIX}libxml2')
50} 56}
51 57
52PACKAGES += "${PN}-utils" 58PACKAGES += "${PN}-utils ${PN}-python"
53 59
60FILES_${PN}-dbg += "${PYTHON_SITEPACKAGES_DIR}/.debug"
61FILES_${PN}-staticdev += "${PYTHON_SITEPACKAGES_DIR}/*.a"
54FILES_${PN}-dev += "${libdir}/xml2Conf.sh" 62FILES_${PN}-dev += "${libdir}/xml2Conf.sh"
55FILES_${PN}-utils += "${bindir}/*" 63FILES_${PN}-utils += "${bindir}/*"
64FILES_${PN}-python += "${PYTHON_SITEPACKAGES_DIR}"
56 65
57do_install_ptest () { 66do_install_ptest () {
58 cp -r ${WORKDIR}/xmlconf ${D}${PTEST_PATH} 67 cp -r ${WORKDIR}/xmlconf ${D}${PTEST_PATH}