Return-Path: Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by mail.openembedded.org (Postfix) with ESMTP id 707B67FAB7 for ; Fri, 29 Nov 2019 13:12:23 +0000 (UTC) Received: by mail-wr1-f66.google.com with SMTP id g17so3112667wro.2 for ; Fri, 29 Nov 2019 05:12:24 -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=G6NYK0aOS1uA80K9HKhyWenbeLj7Hob4IlCxjC69X6dU4acqVne5KoXGeD686zhfNC qiX0p/KGdy21PS12nz3KnHddhI2C5avxcytt4RPWce9OHyV71b9o1og4Ge/EoerNabwC Zx8b3TmrhcNakLBilvQBmUQC1MygcG7+Ez5C5D1LKvXppsLQqK39qEFabQbVlYYQ/eYw 1NKHAvYqjX2wfLt6fyC3zIG5qGld/ZfD2xMTT3ePdI4zU4KRmwIKWrFnwZQ5YVLIsW5w +TmZ/qouKWJdJl4r2gYznv0vKzxuhwffc6U0SqNrJxeNo+RsbU0bATlOMDkYMEOdNEJl XqNw== 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=qdEryjyvnxQWAHXfIyMgmANPmL8PMWnyNjGPqDsr8031dg+TnPjWAVxNoN7RKzgsQS 2rAGx3KkJm9L/iX15hrxEVRXKgVG3/aV+PQF+Db9KLTgRWwCOjtuEripEL1HByZuvun9 JnU/I9/8XWiXppSlO6ImCSO5Cvy7ap6gcJ6HyjlwcGCKklIUzrJHKs4F9YCkgGc/Mx/L A4fWEZHuJhravLTV0RB2hKdHTyA0Lp/14IsTIXZPQp0vMx5OdoObmIpsAYnzaqVS1n2Z eOPOvceN1Q4scsxj/lyxfmKKLbWMO5SvQ1Lfbo6wjrT7bAaz3F6i3wZWJqkTS1O5M7P7 Aj3g== X-Gm-Message-State: APjAAAX5BVkNgHlYraBryjAXQS2JgGXKd0qo/jqNR6Zv+NcdKGtt7Sja DBQ7jgOR/nfYs7gXVNARXGxXgTHl X-Google-Smtp-Source: APXvYqy5QCKfdvT4Ozz6wjNCyIRgq6qw7HoMroB2PyEVWctXLxROnXZPFLirigbWT9k1xsojSTXtKw== X-Received: by 2002:adf:ec89:: with SMTP id z9mr54288328wrn.153.1575033143383; Fri, 29 Nov 2019 05:12:23 -0800 (PST) Received: from alexander-box.rd.corpintra.net ([141.113.66.202]) by smtp.gmail.com with ESMTPSA id v17sm637224wrt.91.2019.11.29.05.12.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Nov 2019 05:12:22 -0800 (PST) From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Date: Fri, 29 Nov 2019 14:11:49 +0100 Message-Id: <20191129131152.128311-12-alex.kanavin@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191129131152.128311-1-alex.kanavin@gmail.com> References: <20191129131152.128311-1-alex.kanavin@gmail.com> Subject: [PATCH 12/15] 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: Fri, 29 Nov 2019 13:12:23 -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