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 4de88d39a4..677d8c9bb5 100644 --- a/meta/recipes-core/libxml/libxml2_2.9.4.bb +++ b/meta/recipes-core/libxml/libxml2_2.9.4.bb | |||
| @@ -29,7 +29,8 @@ SRC_URI = "ftp://xmlsoft.org/libxml2/libxml2-${PV}.tar.gz;name=libtar \ | |||
| 29 | file://libxml2-CVE-2017-5969.patch \ | 29 | file://libxml2-CVE-2017-5969.patch \ |
| 30 | file://libxml2-CVE-2017-0663.patch \ | 30 | file://libxml2-CVE-2017-0663.patch \ |
| 31 | file://CVE-2016-9318.patch \ | 31 | file://CVE-2016-9318.patch \ |
| 32 | " | 32 | file://0001-Make-ptest-run-the-python-tests-if-python-is-enabled.patch \ |
| 33 | " | ||
| 33 | 34 | ||
| 34 | SRC_URI[libtar.md5sum] = "ae249165c173b1ff386ee8ad676815f5" | 35 | SRC_URI[libtar.md5sum] = "ae249165c173b1ff386ee8ad676815f5" |
| 35 | SRC_URI[libtar.sha256sum] = "ffb911191e509b966deb55de705387f14156e1a56b21824357cdf0053233633c" | 36 | SRC_URI[libtar.sha256sum] = "ffb911191e509b966deb55de705387f14156e1a56b21824357cdf0053233633c" |
| @@ -48,7 +49,7 @@ inherit autotools pkgconfig binconfig-disabled ptest | |||
| 48 | 49 | ||
| 49 | inherit ${@bb.utils.contains('PACKAGECONFIG', 'python', 'python3native', '', d)} | 50 | inherit ${@bb.utils.contains('PACKAGECONFIG', 'python', 'python3native', '', d)} |
| 50 | 51 | ||
| 51 | RDEPENDS_${PN}-ptest += "make ${@bb.utils.contains('PACKAGECONFIG', 'python', 'python3-core', '', d)}" | 52 | 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)}" |
| 52 | 53 | ||
| 53 | RDEPENDS_${PN}-python += "${@bb.utils.contains('PACKAGECONFIG', 'python', 'python3-core', '', d)}" | 54 | RDEPENDS_${PN}-python += "${@bb.utils.contains('PACKAGECONFIG', 'python', 'python3-core', '', d)}" |
| 54 | 55 | ||
| @@ -82,6 +83,12 @@ do_configure_prepend () { | |||
| 82 | 83 | ||
| 83 | do_install_ptest () { | 84 | do_install_ptest () { |
| 84 | cp -r ${WORKDIR}/xmlconf ${D}${PTEST_PATH} | 85 | cp -r ${WORKDIR}/xmlconf ${D}${PTEST_PATH} |
| 86 | if [ "${@bb.utils.filter('PACKAGECONFIG', 'python', d)}" ]; then | ||
| 87 | sed -i -e 's|^\(PYTHON = \).*|\1${USRBINPATH}/${PYTHON_PN}|' \ | ||
| 88 | ${D}${PTEST_PATH}/python/tests/Makefile | ||
| 89 | grep -lrZ '#!/usr/bin/python' ${D}${PTEST_PATH}/python | | ||
| 90 | xargs -0 sed -i -e 's|/usr/bin/python|${USRBINPATH}/${PYTHON_PN}|' | ||
| 91 | fi | ||
| 85 | } | 92 | } |
| 86 | 93 | ||
| 87 | do_install_append_class-native () { | 94 | do_install_append_class-native () { |
