diff options
Diffstat (limited to 'external/meta-openembedded/meta-oe/recipes-test/catch2')
-rw-r--r-- | external/meta-openembedded/meta-oe/recipes-test/catch2/catch2/0001-Fix-convert-from-char-on-ARM-build.patch | 46 | ||||
-rw-r--r-- | external/meta-openembedded/meta-oe/recipes-test/catch2/catch2_2.9.2.bb (renamed from external/meta-openembedded/meta-oe/recipes-test/catch2/catch2_2.4.1.bb) | 16 |
2 files changed, 7 insertions, 55 deletions
diff --git a/external/meta-openembedded/meta-oe/recipes-test/catch2/catch2/0001-Fix-convert-from-char-on-ARM-build.patch b/external/meta-openembedded/meta-oe/recipes-test/catch2/catch2/0001-Fix-convert-from-char-on-ARM-build.patch deleted file mode 100644 index 30737756..00000000 --- a/external/meta-openembedded/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 <mgaio35@gmail.com> -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 <mgaio35@gmail.com> - -Upstream-Status: Accepted [Commit f1faaa9c107113692301ad8bb56084460ef1a2ff] - -Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com> ---- - 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<bool>::convert(bool b) { - return b ? "true" : "false"; - } - --std::string StringMaker<char>::convert(char value) { -+std::string StringMaker<signed char>::convert(signed char value) { - if (value == '\r') { - return "'\\r'"; - } else if (value == '\f') { -@@ -222,8 +222,8 @@ std::string StringMaker<char>::convert(char value) { - return chstr; - } - } --std::string StringMaker<signed char>::convert(signed char c) { -- return ::Catch::Detail::stringify(static_cast<char>(c)); -+std::string StringMaker<char>::convert(char c) { -+ return ::Catch::Detail::stringify(static_cast<signed char>(c)); - } - std::string StringMaker<unsigned char>::convert(unsigned char c) { - return ::Catch::Detail::stringify(static_cast<char>(c)); --- -2.19.1 - diff --git a/external/meta-openembedded/meta-oe/recipes-test/catch2/catch2_2.4.1.bb b/external/meta-openembedded/meta-oe/recipes-test/catch2/catch2_2.9.2.bb index 0183c2e4..57fc935f 100644 --- a/external/meta-openembedded/meta-oe/recipes-test/catch2/catch2_2.4.1.bb +++ b/external/meta-openembedded/meta-oe/recipes-test/catch2/catch2_2.9.2.bb @@ -5,20 +5,18 @@ 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" +SRC_URI = "git://github.com/catchorg/Catch2.git" +SRCREV = "2c869e17e4803d30b3d5ca5b0d76387b9db97fa5" 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})" - -do_install_append() { - rm ${D}/${datadir}/Catch2/lldbinit - rm ${D}/${datadir}/Catch2/gdbinit - rmdir ${D}/${datadir}/Catch2/ -} |