summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorDmitry Rozhkov <dmitry.rozhkov@linux.intel.com>2017-04-04 09:46:46 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-04-05 23:22:13 +0100
commit79fcbb51577d901639ddfffb3393b1c4d93434f0 (patch)
treef225b8eb5a541856ac13317f3e399622df04b1d1 /meta
parent89622db7c258b1bbbf360ce7f6d90cf4ae5829e2 (diff)
downloadpoky-79fcbb51577d901639ddfffb3393b1c4d93434f0.tar.gz
libxml2: make dependencies on python conditional
The library libxml2 can provide its own bindings for python2 in addition to the third party python-lxml and python3-lxml packages if this functionality is enabled in PACKAGECONFIG. But in case the functionality is disabled there's no need to depend on python2. Make the dependency on python2 enabled only if the python feature is added to PACKAGECONFIG. Also add missing run-time dependency on make to libxml2-ptest. (From OE-Core rev: 3f1be2c3875fc112d9c67af16759091e007e5b99) Signed-off-by: Dmitry Rozhkov <dmitry.rozhkov@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-core/libxml/libxml2_2.9.4.bb20
1 files changed, 11 insertions, 9 deletions
diff --git a/meta/recipes-core/libxml/libxml2_2.9.4.bb b/meta/recipes-core/libxml/libxml2_2.9.4.bb
index 023fe9956d..0c3d683623 100644
--- a/meta/recipes-core/libxml/libxml2_2.9.4.bb
+++ b/meta/recipes-core/libxml/libxml2_2.9.4.bb
@@ -32,22 +32,24 @@ SRC_URI[testtar.sha256sum] = "96151685cec997e1f9f3387e3626d61e6284d4d6e66e0e440c
32 32
33BINCONFIG = "${bindir}/xml2-config" 33BINCONFIG = "${bindir}/xml2-config"
34 34
35inherit autotools pkgconfig binconfig-disabled pythonnative ptest 35PACKAGECONFIG ??= "python \
36 ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} \
37"
38PACKAGECONFIG[python] = "--with-python=${PYTHON},--without-python,python"
39PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"
40
41inherit autotools pkgconfig binconfig-disabled ptest
42
43inherit ${@bb.utils.contains('PACKAGECONFIG', 'python', 'pythonnative', '', d)}
36 44
37RDEPENDS_${PN}-ptest += "python-core" 45RDEPENDS_${PN}-ptest += "make ${@bb.utils.contains('PACKAGECONFIG', 'python', 'python-core', '', d)}"
38 46
39RDEPENDS_${PN}-python += "python-core" 47RDEPENDS_${PN}-python += "${@bb.utils.contains('PACKAGECONFIG', 'python', 'python-core', '', d)}"
40 48
41RDEPENDS_${PN}-ptest_append_libc-glibc = " glibc-gconv-ebcdic-us glibc-gconv-ibm1141" 49RDEPENDS_${PN}-ptest_append_libc-glibc = " glibc-gconv-ebcdic-us glibc-gconv-ibm1141"
42 50
43export PYTHON_SITE_PACKAGES="${PYTHON_SITEPACKAGES_DIR}" 51export PYTHON_SITE_PACKAGES="${PYTHON_SITEPACKAGES_DIR}"
44 52
45PACKAGECONFIG ??= "python \
46 ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} \
47"
48PACKAGECONFIG[python] = "--with-python=${PYTHON},--without-python,python"
49PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"
50
51# WARNING: zlib is require for RPM use 53# WARNING: zlib is require for RPM use
52EXTRA_OECONF = "--without-debug --without-legacy --with-catalog --without-docbook --with-c14n --without-lzma --with-fexceptions" 54EXTRA_OECONF = "--without-debug --without-legacy --with-catalog --without-docbook --with-c14n --without-lzma --with-fexceptions"
53EXTRA_OECONF_class-native = "--without-legacy --without-docbook --with-c14n --without-lzma --with-zlib" 55EXTRA_OECONF_class-native = "--without-legacy --without-docbook --with-c14n --without-lzma --with-zlib"