diff options
Diffstat (limited to 'meta/recipes-core/libxml/libxml2_2.9.4.bb')
-rw-r--r-- | meta/recipes-core/libxml/libxml2_2.9.4.bb | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/meta/recipes-core/libxml/libxml2_2.9.4.bb b/meta/recipes-core/libxml/libxml2_2.9.4.bb index ea0d3b88af..4f60781d22 100644 --- a/meta/recipes-core/libxml/libxml2_2.9.4.bb +++ b/meta/recipes-core/libxml/libxml2_2.9.4.bb | |||
@@ -24,7 +24,8 @@ SRC_URI = "ftp://xmlsoft.org/libxml2/libxml2-${PV}.tar.gz;name=libtar \ | |||
24 | file://libxml2-CVE-2016-4658.patch \ | 24 | file://libxml2-CVE-2016-4658.patch \ |
25 | file://libxml2-fix_NULL_pointer_derefs.patch \ | 25 | file://libxml2-fix_NULL_pointer_derefs.patch \ |
26 | file://CVE-2016-9318.patch \ | 26 | file://CVE-2016-9318.patch \ |
27 | " | 27 | file://0001-Make-ptest-run-the-python-tests-if-python-is-enabled.patch \ |
28 | " | ||
28 | 29 | ||
29 | SRC_URI[libtar.md5sum] = "ae249165c173b1ff386ee8ad676815f5" | 30 | SRC_URI[libtar.md5sum] = "ae249165c173b1ff386ee8ad676815f5" |
30 | SRC_URI[libtar.sha256sum] = "ffb911191e509b966deb55de705387f14156e1a56b21824357cdf0053233633c" | 31 | SRC_URI[libtar.sha256sum] = "ffb911191e509b966deb55de705387f14156e1a56b21824357cdf0053233633c" |
@@ -43,7 +44,7 @@ inherit autotools pkgconfig binconfig-disabled ptest | |||
43 | 44 | ||
44 | inherit ${@bb.utils.contains('PACKAGECONFIG', 'python', 'python3native', '', d)} | 45 | inherit ${@bb.utils.contains('PACKAGECONFIG', 'python', 'python3native', '', d)} |
45 | 46 | ||
46 | RDEPENDS_${PN}-ptest += "make ${@bb.utils.contains('PACKAGECONFIG', 'python', 'python3-core', '', d)}" | 47 | RDEPENDS_${PN}-ptest += "make ${@bb.utils.contains('PACKAGECONFIG', 'python', 'libgcc python3-core python3-argparse python3-logging python3-shell python3-signal python3-stringold python3-threading python3-unittest ${PN}-python', '', d)}" |
47 | 48 | ||
48 | RDEPENDS_${PN}-python += "${@bb.utils.contains('PACKAGECONFIG', 'python', 'python3-core', '', d)}" | 49 | RDEPENDS_${PN}-python += "${@bb.utils.contains('PACKAGECONFIG', 'python', 'python3-core', '', d)}" |
49 | 50 | ||
@@ -77,6 +78,12 @@ do_configure_prepend () { | |||
77 | 78 | ||
78 | do_install_ptest () { | 79 | do_install_ptest () { |
79 | cp -r ${WORKDIR}/xmlconf ${D}${PTEST_PATH} | 80 | cp -r ${WORKDIR}/xmlconf ${D}${PTEST_PATH} |
81 | if [ "${@bb.utils.filter('PACKAGECONFIG', 'python', d)}" ]; then | ||
82 | sed -i -e 's|^\(PYTHON = \).*|\1${USRBINPATH}/${PYTHON_PN}|' \ | ||
83 | ${D}${PTEST_PATH}/python/tests/Makefile | ||
84 | grep -lrZ '#!/usr/bin/python' ${D}${PTEST_PATH}/python | | ||
85 | xargs -0 sed -i -e 's|/usr/bin/python|${USRBINPATH}/${PYTHON_PN}|' | ||
86 | fi | ||
80 | } | 87 | } |
81 | 88 | ||
82 | do_install_append_class-native () { | 89 | do_install_append_class-native () { |