summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2014-09-08 20:24:38 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-05-14 11:43:57 +0100
commit212d9d4245cef2343f21d65fa1ee7cfd537432a3 (patch)
tree13afe6d1a10a2d2390b093652caf651bbaeeaef3 /meta
parent52e465f3fe543521d1be51b0d2816a72edaba818 (diff)
downloadpoky-212d9d4245cef2343f21d65fa1ee7cfd537432a3.tar.gz
libxml2: fix python path and add libxml2-python
We have libxml2-python for native and nativesdk, but don't have it for target, and can't find the reason from the git log, libxml2-python is widely used, after looked into it's configure.in, we can add it by PACKAGECONFIG. The previous --with-python=${STAGING_BINDIR}/python is incorrect, it acted as work becase it's conigure can check automatically, python is in ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN}, as known as ${PYTHON}. Add python to PACKAGECONFIG, since createrepo rdepends on libxml2-python, otherwise the target createrepo can't work. (From OE-Core rev: ed72e123724599e70eb4d283f06fca3e56a8b50a) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-core/libxml/libxml2.inc20
1 files changed, 10 insertions, 10 deletions
diff --git a/meta/recipes-core/libxml/libxml2.inc b/meta/recipes-core/libxml/libxml2.inc
index 1314bbfb8d..d337bec0d0 100644
--- a/meta/recipes-core/libxml/libxml2.inc
+++ b/meta/recipes-core/libxml/libxml2.inc
@@ -9,8 +9,6 @@ LIC_FILES_CHKSUM = "file://Copyright;md5=2044417e2e5006b65a8b9067b683fcf1 \
9 file://list.c;beginline=4;endline=13;md5=cdbfa3dee51c099edb04e39f762ee907 \ 9 file://list.c;beginline=4;endline=13;md5=cdbfa3dee51c099edb04e39f762ee907 \
10 file://trio.c;beginline=5;endline=14;md5=6c025753c86d958722ec76e94cae932e" 10 file://trio.c;beginline=5;endline=14;md5=6c025753c86d958722ec76e94cae932e"
11 11
12DEPENDS_class-nativesdk = "nativesdk-python"
13DEPENDS_class-native = "python-native"
14DEPENDS =+ "zlib" 12DEPENDS =+ "zlib"
15 13
16SRC_URI = "ftp://xmlsoft.org/libxml2/libxml2-${PV}.tar.gz;name=libtar \ 14SRC_URI = "ftp://xmlsoft.org/libxml2/libxml2-${PV}.tar.gz;name=libtar \
@@ -30,6 +28,8 @@ inherit autotools pkgconfig binconfig-disabled pythonnative ptest
30 28
31RDEPENDS_${PN}-ptest += "python-core" 29RDEPENDS_${PN}-ptest += "python-core"
32 30
31RDEPENDS_${PN}-python += "python-core"
32
33RDEPENDS_${PN}-ptest_append_libc-glibc += "glibc-gconv-ebcdic-us glibc-gconv-ibm1141" 33RDEPENDS_${PN}-ptest_append_libc-glibc += "glibc-gconv-ebcdic-us glibc-gconv-ibm1141"
34 34
35# We don't DEPEND on binutils for ansidecl.h so ensure we don't use the header 35# We don't DEPEND on binutils for ansidecl.h so ensure we don't use the header
@@ -37,16 +37,16 @@ do_configure_prepend () {
37 sed -i -e '/.*ansidecl.h.*/d' ${S}/configure.ac 37 sed -i -e '/.*ansidecl.h.*/d' ${S}/configure.ac
38} 38}
39 39
40do_configure_prepend_class-nativesdk () { 40export PYTHON_SITE_PACKAGES="${PYTHON_SITEPACKAGES_DIR}"
41 # Ensure we get the correct site-packages path 41
42 export PYTHON_SITE_PACKAGES="${PYTHON_SITEPACKAGES_DIR}" 42PACKAGECONFIG ??= "python"
43}
44 43
44PACKAGECONFIG[python] = "--with-python=${PYTHON},--without-python,python"
45# WARNING: zlib is require for RPM use 45# WARNING: zlib is require for RPM use
46EXTRA_OECONF = "--without-python --without-debug --without-legacy --with-catalog --without-docbook --with-c14n --without-lzma --with-fexceptions" 46EXTRA_OECONF = "--without-debug --without-legacy --with-catalog --without-docbook --with-c14n --without-lzma --with-fexceptions"
47EXTRA_OECONF_class-native = "--with-python=${STAGING_BINDIR}/python --without-legacy --without-docbook --with-c14n --without-lzma --with-zlib" 47EXTRA_OECONF_class-native = "--without-legacy --without-docbook --with-c14n --without-lzma --with-zlib"
48EXTRA_OECONF_class-nativesdk = "--with-python=${STAGING_BINDIR}/python --without-legacy --without-docbook --with-c14n --without-lzma --with-zlib" 48EXTRA_OECONF_class-nativesdk = "--without-legacy --without-docbook --with-c14n --without-lzma --with-zlib"
49EXTRA_OECONF_linuxstdbase = "--without-python --with-debug --with-legacy --with-docbook --with-c14n --without-lzma --with-zlib" 49EXTRA_OECONF_linuxstdbase = "--with-debug --with-legacy --with-docbook --with-c14n --without-lzma --with-zlib"
50 50
51# required for pythong binding 51# required for pythong binding
52export HOST_SYS 52export HOST_SYS