From ba604d99ae80b3e0fb908f4de8f1ac9008b7336f Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 17 Dec 2018 17:33:42 -0800 Subject: catch2: Upgrade to 2.5.0 release Drop upstreamed patch and add a patch to fix build seen with clang and gcc9 Signed-off-by: Khem Raj --- .../0001-Fix-convert-from-char-on-ARM-build.patch | 46 ---------------------- .../catch2/catch2/0001-Remove-redundant-move.patch | 36 +++++++++++++++++ meta-oe/recipes-test/catch2/catch2_2.4.1.bb | 24 ----------- meta-oe/recipes-test/catch2/catch2_2.5.0.bb | 26 ++++++++++++ 4 files changed, 62 insertions(+), 70 deletions(-) delete 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/0001-Remove-redundant-move.patch delete mode 100644 meta-oe/recipes-test/catch2/catch2_2.4.1.bb create mode 100644 meta-oe/recipes-test/catch2/catch2_2.5.0.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 deleted file mode 100644 index 3073775630..0000000000 --- a/meta-oe/recipes-test/catch2/catch2/0001-Fix-convert-from-char-on-ARM-build.patch +++ /dev/null @@ -1,46 +0,0 @@ -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/0001-Remove-redundant-move.patch b/meta-oe/recipes-test/catch2/catch2/0001-Remove-redundant-move.patch new file mode 100644 index 0000000000..c3f5fc9ce7 --- /dev/null +++ b/meta-oe/recipes-test/catch2/catch2/0001-Remove-redundant-move.patch @@ -0,0 +1,36 @@ +From b2bd82a0c0d3d5dda588d12cc1672a03a9630784 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 17 Dec 2018 17:27:43 -0800 +Subject: [PATCH] Remove redundant move + +fixes errors like below + +/mnt/a/yoe/build/tmp/work/aarch64-yoe-linux-musl/catch2/2.5.0-r0/git/include/internal/catch_session.cpp:52:29: +error: redundant move in return statement [-Werror=redundant-move] + 52 | return std::move(multi); + | ~~~~~~~~~^~~~~~~ +/mnt/a/yoe/build/tmp/work/aarch64-yoe-linux-musl/catch2/2.5.0-r0/git/include/internal/catch_session.cpp:52:29: +note: remove 'std::move' call + +Upstream-Status: Submitted [https://github.com/catchorg/Catch2/pull/1474] +Signed-off-by: Khem Raj +--- + include/internal/catch_session.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/internal/catch_session.cpp b/include/internal/catch_session.cpp +index 0920521c..b66d57ac 100644 +--- a/include/internal/catch_session.cpp ++++ b/include/internal/catch_session.cpp +@@ -49,7 +49,7 @@ namespace Catch { + multi->addListener(listener->create(Catch::ReporterConfig(config))); + } + multi->addReporter(createReporter(config->getReporterName(), config)); +- return std::move(multi); ++ return multi; + } + + +-- +2.20.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 deleted file mode 100644 index 0183c2e41a..0000000000 --- a/meta-oe/recipes-test/catch2/catch2_2.4.1.bb +++ /dev/null @@ -1,24 +0,0 @@ -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" - -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/ -} diff --git a/meta-oe/recipes-test/catch2/catch2_2.5.0.bb b/meta-oe/recipes-test/catch2/catch2_2.5.0.bb new file mode 100644 index 0000000000..14a1ebe80d --- /dev/null +++ b/meta-oe/recipes-test/catch2/catch2_2.5.0.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-Remove-redundant-move.patch \ + " +# v2.5.0 +SRCREV = "6ccd467094973824d89efb16cbc553e279f79823" + +S = "${WORKDIR}/git" + +inherit cmake python3native + +do_install_append() { + rm ${D}${datadir}/Catch2/lldbinit + rm ${D}${datadir}/Catch2/gdbinit + rmdir ${D}${datadir}/Catch2/ +} +# Header-only library +RDEPENDS_${PN}-dev = "" +RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})" + -- cgit 1.2.3-korg