libxml2: fix python packaging for nativesdk
We enable the python module in nativesdk-libxml2, but the python binary used is in the native sysroot and thus you get the module installed in the wrong path. Even with that fixed the python files are still unpackaged, so create an ${PN}-python package and add them to it. (This does not affect the libxml target build at all since python is disabled for that.) (From OE-Core rev: e3d06aa104065748367e1479138f824da5d9951f) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
f0b9a7cf9f
commit
f852934df4
|
@ -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}
|
||||
|
|
|
@ -0,0 +1,21 @@
|
|||
Allow us to pass in PYTHON_SITE_PACKAGES
|
||||
|
||||
The python binary used when building for nativesdk doesn't give us the
|
||||
correct path here so we need to be able to specify it ourselves.
|
||||
|
||||
Upstream-Status: Inappropriate [config]
|
||||
|
||||
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
|
||||
|
||||
--- a/configure.in
|
||||
+++ b/configure.in
|
||||
@@ -743,7 +743,8 @@ dnl
|
||||
|
||||
PYTHON_VERSION=
|
||||
PYTHON_INCLUDES=
|
||||
-PYTHON_SITE_PACKAGES=
|
||||
+# Allow this to be set externally
|
||||
+#PYTHON_SITE_PACKAGES=
|
||||
PYTHON_TESTS=
|
||||
pythondir=
|
||||
if test "$with_python" != "no" ; then
|
Loading…
Reference in New Issue