diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2019-11-25 16:13:13 +0100 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2019-11-27 12:31:39 -0800 |
commit | a6a2e94c0ccf83aa711243d853360d8ca0c5c8b1 (patch) | |
tree | 64cf72795fd174a138e9a432491f22db616ab7be | |
parent | d71d427e5034f74c8ff2cb3f58350e30b6706f65 (diff) | |
download | openembedded-core-contrib-akuster/master_pkg_update.tar.gz |
gettext: fix failing ptestsakuster/master_pkg_update
Results:
pass 400
fail 0
skip 32
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r-- | meta/recipes-core/gettext/gettext_0.20.1.bb | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/meta/recipes-core/gettext/gettext_0.20.1.bb b/meta/recipes-core/gettext/gettext_0.20.1.bb index fc05ef2e0a..a6fc219568 100644 --- a/meta/recipes-core/gettext/gettext_0.20.1.bb +++ b/meta/recipes-core/gettext/gettext_0.20.1.bb @@ -44,6 +44,10 @@ EXTRA_OECONF += "--without-lispdir \ " EXTRA_OECONF_append_class-target = " \ --with-bisonlocaledir=${datadir}/locale \ + gt_cv_locale_fr_utf8=fr_FR \ + gt_cv_locale_fr=fr_FR.ISO-8859-1 \ + gt_cv_locale_de_utf8=de_DE \ + gt_cv_locale_de=de_DE.ISO-8859-1 \ " PACKAGECONFIG ??= "croco glib libxml" @@ -143,13 +147,17 @@ do_install_ptest() { mkdir -p ${D}${PTEST_PATH}/src mkdir -p ${D}${PTEST_PATH}/po mkdir -p ${D}${PTEST_PATH}/misc + mkdir -p ${D}${PTEST_PATH}/its + mkdir -p ${D}${PTEST_PATH}/styles + cp -rf ${S}/gettext-tools/its/* ${D}${PTEST_PATH}/its + cp -rf ${S}/gettext-tools/styles/* ${D}${PTEST_PATH}/styles cp -rf ${S}/gettext-tools/tests/* ${D}${PTEST_PATH}/tests cp -rf ${B}/gettext-tools/tests/.libs/* ${D}${PTEST_PATH}/tests cp -rf ${B}/gettext-runtime/intl/.libs/libgnuintl.so.8* ${D}${libdir}/ cp -rf ${B}/gettext-tools/tests/Makefile ${D}${PTEST_PATH}/tests + cp -rf ${B}/gettext-tools/tests/init-env ${D}${PTEST_PATH}/tests sed -i '/^Makefile:/c Makefile:' ${D}${PTEST_PATH}/tests/Makefile - sed -i -e 's:CONFIG_SHELL=.*:& LOCALE_FR='fr_FR.iso88591' LOCALE_FR_UTF8='fr_FR.utf8' LOCALE_JA='ja_JP.eucjp':g' \ - -e 's:lang-c lang-c++:lang-c++:g' ${D}${PTEST_PATH}/tests/Makefile + sed -i -e 's:lang-c lang-c++:lang-c++:g' ${D}${PTEST_PATH}/tests/Makefile install ${S}/gettext-tools/src/msgunfmt.tcl ${D}${PTEST_PATH}/src install ${S}/gettext-tools/src/project-id ${D}${PTEST_PATH}/src install ${B}/gettext-runtime/src/gettext.sh ${D}${PTEST_PATH}/src @@ -177,8 +185,19 @@ RDEPENDS_${PN}-ptest_append_libc-glibc = "\ glibc-gconv-koi8-r \ glibc-gconv-iso8859-2 \ glibc-charmap-iso-8859-2 \ + glibc-gconv-iso8859-1 \ + glibc-charmap-iso-8859-1 \ glibc-gconv-euc-kr \ glibc-charmap-euc-kr \ + glibc-gconv-euc-jp \ + glibc-charmap-euc-jp \ + locale-base-de-de \ + locale-base-fr-fr \ +" + +RRECOMMENDS_${PN}-ptest_append_libc-glibc = "\ + locale-base-de-de.iso-8859-1 \ + locale-base-fr-fr.iso-8859-1 \ " INSANE_SKIP_${PN}-ptest += "ldflags" |