summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2014-06-05 10:46:17 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-06-06 09:26:05 +0100
commitf852934df4efd977e4a7095a4c45e79b477fc4b8 (patch)
treea6c4da0643dfaf1356c3460223201f2dd9b92181 /meta
parentf0b9a7cf9f80be1917e45266fa201f464a28c1e5 (diff)
downloadpoky-f852934df4efd977e4a7095a4c45e79b477fc4b8.tar.gz
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>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-core/libxml/libxml2.inc11
-rw-r--r--meta/recipes-core/libxml/libxml2/python-sitepackages-dir.patch21
2 files changed, 31 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}
diff --git a/meta/recipes-core/libxml/libxml2/python-sitepackages-dir.patch b/meta/recipes-core/libxml/libxml2/python-sitepackages-dir.patch
new file mode 100644
index 0000000000..a697ddf873
--- /dev/null
+++ b/meta/recipes-core/libxml/libxml2/python-sitepackages-dir.patch
@@ -0,0 +1,21 @@
1Allow us to pass in PYTHON_SITE_PACKAGES
2
3The python binary used when building for nativesdk doesn't give us the
4correct path here so we need to be able to specify it ourselves.
5
6Upstream-Status: Inappropriate [config]
7
8Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
9
10--- a/configure.in
11+++ b/configure.in
12@@ -743,7 +743,8 @@ dnl
13
14 PYTHON_VERSION=
15 PYTHON_INCLUDES=
16-PYTHON_SITE_PACKAGES=
17+# Allow this to be set externally
18+#PYTHON_SITE_PACKAGES=
19 PYTHON_TESTS=
20 pythondir=
21 if test "$with_python" != "no" ; then