From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by mail.openembedded.org (Postfix) with ESMTP id 245EE60801 for ; Mon, 15 Oct 2018 15:45:00 +0000 (UTC) Received: by mail-wm1-f66.google.com with SMTP id 206-v6so19426140wmb.5 for ; Mon, 15 Oct 2018 08:45:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=bgiaQazVROxZ/o7/rd3p27R59K46zVDfndULs9hiJNU=; b=GxNEjRmXafsHYUFAC8vYsQQeYHIWnuI6P01ZTaDKVUw9EOQ2BXDM8uhUUTwnajU+CV mmOk4bysmgUe7qftBJR6H1KUS2kElki6cDHO43PpvPMgBQ5Tzl+i1gH2Hr6NbcbSyqEo ZFVWWiXO0BnnYOjr1fQeugtoEBtdggHCAyqzGPMAamxnFw78FDUDCwTD7RYXVUD3ZSyU XvTwMJofjYtK6zzRh8cMYhg9vhgb7Umv/w2ZKmJWyxzL261sOGkkG8xw8ICtr1UInf2X +bGkfA5MntJ+SY2DHDMT3YptRtaQiLOUKdGSTRE/WjxX/VfJipCq7OKbMZPESDF2q3ZR rbgQ== 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:mime-version :content-transfer-encoding; bh=bgiaQazVROxZ/o7/rd3p27R59K46zVDfndULs9hiJNU=; b=DO4NejCvDe5wPNse5/+Pf5MN0gYBb3adYk0fBL3b+l4zmHeZcqgUHMfU+XFVRooi96 H6K8w0S50Ns/DLUueJLZ8vpbu37CzJRlrBLfj4xwgmnrnE1o77VROYQpUmVuV+N94Gk9 OcPjcox0CVYcyY8MA0rdC8tSGDKNhGVG38jDdKJS2fZrRj031ajPsqxbZ+RptIjibK9N 2OQDjeAo1Ap+CIIPhWOUM2l38W3pq0yiq8CEFyAk7yLDCbjWOP9EApv8YkC86JX3ry/K w+mot7Cmie7Vf43++IUORUXZx+KQp19lYzi1Q1YZpq0Xl+Ta3IWHa4vxrUgoMwwdxPhf hTTA== X-Gm-Message-State: ABuFfohN1QlWif9wVALgr4IWRi/29iasLKc0vvEBaWH0AwPgHIRpjE4l I9VTm2hJJzbT4PdWIBr4MBkXb6wqL/Y= X-Google-Smtp-Source: ACcGV617uTUkcdBmrJKMFwiv6uJ5r4pMQeMuJvZecQ1A0zIn/VWS7HipeZNFWdfzBwSuCUCjNb4Jrw== X-Received: by 2002:a1c:7f83:: with SMTP id a125-v6mr14084875wmd.23.1539618301121; Mon, 15 Oct 2018 08:45:01 -0700 (PDT) Received: from debian-brgl.baylibre.local (AStLambert-681-1-4-9.w90-86.abo.wanadoo.fr. [90.86.11.9]) by smtp.gmail.com with ESMTPSA id a11-v6sm15025971wrp.3.2018.10.15.08.44.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 15 Oct 2018 08:45:00 -0700 (PDT) From: Bartosz Golaszewski To: openembedded-devel@lists.openembedded.org, Khem Raj , Armin Kuster , Hiram Lew , Jan Kaisrlik , Lukas Karas Date: Mon, 15 Oct 2018 17:44:55 +0200 Message-Id: <20181015154455.6241-1-brgl@bgdev.pl> X-Mailer: git-send-email 2.19.1 MIME-Version: 1.0 Cc: Bartosz Golaszewski Subject: [PATCH v2] catch2: new package X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Oct 2018 15:45:01 -0000 Content-Transfer-Encoding: 8bit From: Bartosz Golaszewski Add a recipe for the catch2 testing framework. There's a bug upstream which makes it impossible to build with gcc7 so include a patch. Signed-off-by: Bartosz Golaszewski --- v1 -> v2: - upstream merged a different solution for the build error: backport the relevant patch, include Upstream-Status tag - use ${datadir} instead of hardcoded paths - depend on python3-native, not python-native - replace ALLOW_EMPTY_${PN} = "1" with RDEPENDS/RRECOMMENDS ...1-Fix-convert-from-char-on-ARM-build.patch | 46 +++++++++++++++++++ meta-oe/recipes-test/catch2/catch2_2.4.1.bb | 26 +++++++++++ 2 files changed, 72 insertions(+) create mode 100644 meta-oe/recipes-test/catch2/catch2/0001-Fix-convert-from-char-on-ARM-build.patch create mode 100644 meta-oe/recipes-test/catch2/catch2_2.4.1.bb diff --git a/meta-oe/recipes-test/catch2/catch2/0001-Fix-convert-from-char-on-ARM-build.patch b/meta-oe/recipes-test/catch2/catch2/0001-Fix-convert-from-char-on-ARM-build.patch new file mode 100644 index 000000000..307377563 --- /dev/null +++ b/meta-oe/recipes-test/catch2/catch2/0001-Fix-convert-from-char-on-ARM-build.patch @@ -0,0 +1,46 @@ +From 5729874fa5059c39aa97cfa08fddf107b7a65c9e Mon Sep 17 00:00:00 2001 +From: Miguel Gaio +Date: Wed, 3 Oct 2018 10:22:16 +0200 +Subject: [PATCH] Fix convert from char on ARM build + +Some platforms set the signedness of char to unsigned (eg. ARM). +Convert from char should not assume the signedness of char. + +Fix build issue with -Werror,-Wtautological-unsigned-zero-compare flags. + +Signed-off-by: Miguel Gaio + +Upstream-Status: Accepted [Commit f1faaa9c107113692301ad8bb56084460ef1a2ff] + +Signed-off-by: Bartosz Golaszewski +--- + include/internal/catch_tostring.cpp | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/include/internal/catch_tostring.cpp b/include/internal/catch_tostring.cpp +index 4e0c027d..8cbabbf2 100644 +--- a/include/internal/catch_tostring.cpp ++++ b/include/internal/catch_tostring.cpp +@@ -205,7 +205,7 @@ std::string StringMaker::convert(bool b) { + return b ? "true" : "false"; + } + +-std::string StringMaker::convert(char value) { ++std::string StringMaker::convert(signed char value) { + if (value == '\r') { + return "'\\r'"; + } else if (value == '\f') { +@@ -222,8 +222,8 @@ std::string StringMaker::convert(char value) { + return chstr; + } + } +-std::string StringMaker::convert(signed char c) { +- return ::Catch::Detail::stringify(static_cast(c)); ++std::string StringMaker::convert(char c) { ++ return ::Catch::Detail::stringify(static_cast(c)); + } + std::string StringMaker::convert(unsigned char c) { + return ::Catch::Detail::stringify(static_cast(c)); +-- +2.19.1 + diff --git a/meta-oe/recipes-test/catch2/catch2_2.4.1.bb b/meta-oe/recipes-test/catch2/catch2_2.4.1.bb new file mode 100644 index 000000000..370ade150 --- /dev/null +++ b/meta-oe/recipes-test/catch2/catch2_2.4.1.bb @@ -0,0 +1,26 @@ +DESCRIPTION = "A modern, C++-native, header-only, test framework for unit-tests, \ +TDD and BDD - using C++11, C++14, C++17 and later." +AUTHOR = "Phil Nash, Martin Horenovsky and others" +HOMEPAGE = "https://github.com/catchorg/Catch2" +LICENSE = "BSL-1.0" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e4224ccaecb14d942c71d31bef20d78c" + +SRC_URI = "git://github.com/catchorg/Catch2.git \ + file://0001-Fix-convert-from-char-on-ARM-build.patch" +SRCREV = "9e1bdca4667295fcb16265eae00efa8423f07007" + +S = "${WORKDIR}/git" + +DEPENDS = "python3-native" + +inherit cmake python3native + +# Header-only library +RDEPENDS_${PN}-dev = "" +RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})" + +do_install_append() { + rm ${D}/${datadir}/Catch2/lldbinit + rm ${D}/${datadir}/Catch2/gdbinit + rmdir ${D}/${datadir}/Catch2/ +} -- 2.19.1