From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by mail.openembedded.org (Postfix) with ESMTP id 2BA037F827 for ; Thu, 5 Dec 2019 15:44:08 +0000 (UTC) Received: by mail-wr1-f65.google.com with SMTP id j42so4139486wrj.12 for ; Thu, 05 Dec 2019 07:44:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=S7y3a4neEKCcOHCjGyZ0EQLQ2Tk5YpxAA4vZl5FVsTQ=; b=HuWhaT2eojgySWlbxwIonaDzYFhDkUtpAUJ5oQdOHC+NqzIgB+Yzp42BjZplFXNd8q /lL4G8Ue/NNC567lfOOR7IJQY2kVb4eSbu8au3YsiyAdiVHr/DA/xpDn6CcRaDQeSrfV 6RKW2IxhLEtVjqplhCSn4BlexFz0DF5U5fkPgkeUJtEgWzTTvwScPL+lmlDKAc+YMLn+ P0TLjiGSK4EaoZKZxRCo19/Pn3qT3H8Fb2b200Qdt2X4Rx5k8tf6/GoIqsBdPdVZlx2e IGIzsN/piamW5yhnZqprf5vVxzryVDwJeV+53Do+4R+ZgATZGWoJQQoX5LqMcbvGIWHg y5kA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=S7y3a4neEKCcOHCjGyZ0EQLQ2Tk5YpxAA4vZl5FVsTQ=; b=Bd7uaE/DZ3vlSYP1ZLu80tyhDiG7X2q0c5xRrFmLeYXVncmOLIMjw1eFMxWMPEZCbT it33DW7cIAi30XxBizWWY20OTEVbvuAwa0Rmw3dHEFpsiRQx0Lw6ufs/inGIwvgJbz+Z ksArPb2bgiQqU5v0f6MFZxXBzgpYwCoKE2JMzHYRa7klioq1y06GD4y82qYvnaCSFWIf qNiDM1Hm1Sp5z+zeYEWj9p+y7tgnqsUSUIEznyaIci7ZMTx5GAEO9hajOq66FvnNACXM yJx9Rk3HS0mcvYeOLJRPNs3doSVk9ZvMYIwDsySQzzOqW3G3pcG1prUGr+5bQ5Q5zw5R KL4g== X-Gm-Message-State: APjAAAUCCdROIMGsgbh97eDnyMDwB7IxfxLZtlOVqOQhd8bJSPoiqDuq /7bCIOHSvBm27PkYwrqypb1RVSJC X-Google-Smtp-Source: APXvYqwmOnijckeOAtRRw63aeNWht+OxxAEfDC/Ce30SFdXp/f9wJ+cMpPCYQyAcUwVTa4brHtYsXQ== X-Received: by 2002:a5d:53d1:: with SMTP id a17mr10463080wrw.327.1575560648580; Thu, 05 Dec 2019 07:44:08 -0800 (PST) Received: from alexander-box.rd.corpintra.net ([141.113.66.202]) by smtp.gmail.com with ESMTPSA id z64sm223330wmg.30.2019.12.05.07.44.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Dec 2019 07:44:08 -0800 (PST) From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Date: Thu, 5 Dec 2019 16:43:38 +0100 Message-Id: <20191205154357.121346-5-alex.kanavin@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191205154357.121346-1-alex.kanavin@gmail.com> References: <20191205154357.121346-1-alex.kanavin@gmail.com> Subject: [PATCH 05/24] gettext: fix failing ptests X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Dec 2019 15:44:08 -0000 Results: pass 400 fail 0 skip 32 Signed-off-by: Alexander Kanavin --- meta/recipes-core/gettext/gettext_0.20.1.bb | 23 +++++++++++++++++++-- 1 file 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 fc05ef2e0a3..a6fc2195685 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" -- 2.17.1