diff options
author | Khem Raj <raj.khem@gmail.com> | 2023-04-16 23:04:33 -0700 |
---|---|---|
committer | Steve Sakoman <steve@sakoman.com> | 2023-05-17 04:07:12 -1000 |
commit | 626e16baaf185f665dde67ef45ccfd4a2b9c2867 (patch) | |
tree | 44536d50e4be91a61909c433f9758f9e8dea469a | |
parent | d30fb748fe1ef870cb28d54bebbad289be3d998d (diff) | |
download | poky-626e16baaf185f665dde67ef45ccfd4a2b9c2867.tar.gz |
libxml2: Disable icu tests on musl
these tests do not work with musl's iconv implementation and would need
enabling icu support using --with-icu which we do not enable by default
Additionally enable locale with musl too.
(From OE-Core rev: 1fbab00c9d887285a9e966e81ff75a7fc7039baa)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
(cherry picked from commit 03980db15fa1de2f970705364c2316f17428a3aa)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
-rw-r--r-- | meta/recipes-core/libxml/libxml2_2.10.3.bb | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/meta/recipes-core/libxml/libxml2_2.10.3.bb b/meta/recipes-core/libxml/libxml2_2.10.3.bb index 6b3dd3ec42..0ccd48964f 100644 --- a/meta/recipes-core/libxml/libxml2_2.10.3.bb +++ b/meta/recipes-core/libxml/libxml2_2.10.3.bb | |||
@@ -40,15 +40,15 @@ inherit autotools pkgconfig binconfig-disabled ptest | |||
40 | 40 | ||
41 | inherit ${@bb.utils.contains('PACKAGECONFIG', 'python', 'python3targetconfig', '', d)} | 41 | inherit ${@bb.utils.contains('PACKAGECONFIG', 'python', 'python3targetconfig', '', d)} |
42 | 42 | ||
43 | RDEPENDS:${PN}-ptest += "bash make ${@bb.utils.contains('PACKAGECONFIG', 'python', 'libgcc python3-core python3-logging python3-shell python3-stringold python3-threading python3-unittest ${PN}-python', '', d)}" | 43 | RDEPENDS:${PN}-ptest += "bash make locale-base-en-us ${@bb.utils.contains('PACKAGECONFIG', 'python', 'libgcc python3-core python3-logging python3-shell python3-stringold python3-threading python3-unittest ${PN}-python', '', d)}" |
44 | 44 | ||
45 | RDEPENDS:${PN}-python += "${@bb.utils.contains('PACKAGECONFIG', 'python', 'python3-core', '', d)}" | 45 | RDEPENDS:${PN}-python += "${@bb.utils.contains('PACKAGECONFIG', 'python', 'python3-core', '', d)}" |
46 | 46 | ||
47 | RDEPENDS:${PN}-ptest:append:libc-musl = " musl-locales" | ||
47 | RDEPENDS:${PN}-ptest:append:libc-glibc = " glibc-gconv-ebcdic-us \ | 48 | RDEPENDS:${PN}-ptest:append:libc-glibc = " glibc-gconv-ebcdic-us \ |
48 | glibc-gconv-ibm1141 \ | 49 | glibc-gconv-ibm1141 \ |
49 | glibc-gconv-iso8859-5 \ | 50 | glibc-gconv-iso8859-5 \ |
50 | glibc-gconv-euc-jp \ | 51 | glibc-gconv-euc-jp \ |
51 | locale-base-en-us \ | ||
52 | " | 52 | " |
53 | 53 | ||
54 | # WARNING: zlib is required for RPM use | 54 | # WARNING: zlib is required for RPM use |
@@ -85,6 +85,11 @@ do_install_ptest () { | |||
85 | fi | 85 | fi |
86 | } | 86 | } |
87 | 87 | ||
88 | # with musl we need to enable icu support explicitly for these tests | ||
89 | do_install_ptest:append:libc-musl () { | ||
90 | rm -rf ${D}/${PTEST_PATH}/test/icu_parse_test.xml | ||
91 | } | ||
92 | |||
88 | do_install:append:class-native () { | 93 | do_install:append:class-native () { |
89 | # Docs are not needed in the native case | 94 | # Docs are not needed in the native case |
90 | rm ${D}${datadir}/gtk-doc -rf | 95 | rm ${D}${datadir}/gtk-doc -rf |