From 1a4b7ee28bf7413af6513fb45ad0d0736048f866 Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Sun, 16 Dec 2018 17:11:34 -0800 Subject: reset upstream subtrees to yocto 2.6 Reset the following subtrees on thud HEAD: poky: 87e3a9739d meta-openembedded: 6094ae18c8 meta-security: 31dc4e7532 meta-raspberrypi: a48743dc36 meta-xilinx: c42016e2e6 Also re-apply backports that didn't make it into thud: poky: 17726d0 systemd-systemctl-native: handle Install wildcards meta-openembedded: 4321a5d libtinyxml2: update to 7.0.1 042f0a3 libcereal: Add native and nativesdk classes e23284f libcereal: Allow empty package 030e8d4 rsyslog: curl-less build with fmhttp PACKAGECONFIG 179a1b9 gtest: update to 1.8.1 Squashed OpenBMC subtree compatibility updates: meta-aspeed: Brad Bishop (1): aspeed: add yocto 2.6 compatibility meta-ibm: Brad Bishop (1): ibm: prepare for yocto 2.6 meta-ingrasys: Brad Bishop (1): ingrasys: set layer compatibility to yocto 2.6 meta-openpower: Brad Bishop (1): openpower: set layer compatibility to yocto 2.6 meta-phosphor: Brad Bishop (3): phosphor: set layer compatibility to thud phosphor: libgpg-error: drop patches phosphor: react to fitimage artifact rename Ed Tanous (4): Dropbear: upgrade options for latest upgrade yocto2.6: update openssl options busybox: remove upstream watchdog patch systemd: Rebase CONFIG_CGROUP_BPF patch Change-Id: I7b1fe71cca880d0372a82d94b5fd785323e3a9e7 Signed-off-by: Brad Bishop --- .../0001-Fix-convert-from-char-on-ARM-build.patch | 46 ++++++++++++++++++++++ .../meta-oe/recipes-test/catch2/catch2_2.4.1.bb | 24 +++++++++++ 2 files changed, 70 insertions(+) create mode 100644 meta-openembedded/meta-oe/recipes-test/catch2/catch2/0001-Fix-convert-from-char-on-ARM-build.patch create mode 100644 meta-openembedded/meta-oe/recipes-test/catch2/catch2_2.4.1.bb (limited to 'meta-openembedded/meta-oe/recipes-test/catch2') diff --git a/meta-openembedded/meta-oe/recipes-test/catch2/catch2/0001-Fix-convert-from-char-on-ARM-build.patch b/meta-openembedded/meta-oe/recipes-test/catch2/catch2/0001-Fix-convert-from-char-on-ARM-build.patch new file mode 100644 index 0000000000..3073775630 --- /dev/null +++ b/meta-openembedded/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-openembedded/meta-oe/recipes-test/catch2/catch2_2.4.1.bb b/meta-openembedded/meta-oe/recipes-test/catch2/catch2_2.4.1.bb new file mode 100644 index 0000000000..0183c2e41a --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-test/catch2/catch2_2.4.1.bb @@ -0,0 +1,24 @@ +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/ +} -- cgit v1.2.3