From 4da592ff5cd9994be7d3facdb2aba988c5b41fee Mon Sep 17 00:00:00 2001 From: Alwin Esch Date: Fri, 10 Dec 2021 21:16:38 +0100 Subject: [PATCH 1/2] fix build error about gtest if warning set to error MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit On my system comes it as compile error, as something sets the warning as error. This the produced error message: ``` [ 12%] Building CXX object googletest/CMakeFiles/gtest.dir/src/gtest-all.cc.o In file included from inputstream.adaptive/build/build/googletest/src/googletest/googletest/src/gtest-all.cc:42: inputstream.adaptive/build/build/googletest/src/googletest/googletest/src/gtest-death-test.cc: In function ‘bool testing::internal::StackGrowsDown()’: inputstream.adaptive/build/build/googletest/src/googletest/googletest/src/gtest-death-test.cc:1301:24: error: ‘dummy’ may be used uninitialized [-Werror=maybe-uninitialized] 1301 | StackLowerThanAddress(&dummy, &result); | ~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~ inputstream.adaptive/build/build/googletest/src/googletest/googletest/src/gtest-death-test.cc:1290:13: note: by argument 1 of type ‘const void*’ to ‘void testing::internal::StackLowerTh 1290 | static void StackLowerThanAddress(const void* ptr, bool* result) { | ^~~~~~~~~~~~~~~~~~~~~ inputstream.adaptive/build/build/googletest/src/googletest/googletest/src/gtest-death-test.cc:1299:7: note: ‘dummy’ declared here 1299 | int dummy; | ^~~~~ cc1plus: all warnings being treated as errors make[5]: *** [googletest/CMakeFiles/gtest.dir/build.make:82: googletest/CMakeFiles/gtest.dir/src/gtest-all.cc.o] Fehler 1 make[4]: *** [CMakeFiles/Makefile2:219: googletest/CMakeFiles/gtest.dir/all] Fehler 2 make[3]: *** [Makefile:160: all] Fehler 2 make[2]: *** [CMakeFiles/googletest.dir/build.make:133: build/googletest/src/googletest-stamp/googletest-build] Fehler 2 make[1]: *** [CMakeFiles/Makefile2:177: CMakeFiles/googletest.dir/all] Fehler 2 ``` By change here becomes the dummy set to 0 and to prevent the warning/error --- .../0001-FixWarningMaybe-uninitialized.patch | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 depends/common/googletest/0001-FixWarningMaybe-uninitialized.patch diff --git a/depends/common/googletest/0001-FixWarningMaybe-uninitialized.patch b/depends/common/googletest/0001-FixWarningMaybe-uninitialized.patch new file mode 100644 index 000000000..2cad4ef7b --- /dev/null +++ b/depends/common/googletest/0001-FixWarningMaybe-uninitialized.patch @@ -0,0 +1,20 @@ +--- a/googletest/src/gtest-death-test.cc ++++ b/googletest/src/gtest-death-test.cc +@@ -1281,7 +1281,7 @@ + GTEST_ATTRIBUTE_NO_SANITIZE_ADDRESS_ + GTEST_ATTRIBUTE_NO_SANITIZE_HWADDRESS_ + static void StackLowerThanAddress(const void* ptr, bool* result) { +- int dummy; ++ int dummy = 0; + *result = (&dummy < ptr); + } + +@@ -1289,7 +1289,7 @@ + GTEST_ATTRIBUTE_NO_SANITIZE_ADDRESS_ + GTEST_ATTRIBUTE_NO_SANITIZE_HWADDRESS_ + static bool StackGrowsDown() { +- int dummy; ++ int dummy = 0; + bool result; + StackLowerThanAddress(&dummy, &result); + return result; From f3716d71d8d0892c7122a2933327a2ad82c8b30e Mon Sep 17 00:00:00 2001 From: Alwin Esch Date: Fri, 10 Dec 2021 22:08:37 +0100 Subject: [PATCH 2/2] increase version to 19.0.1 --- inputstream.adaptive/addon.xml.in | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/inputstream.adaptive/addon.xml.in b/inputstream.adaptive/addon.xml.in index 0a68a446b..418e2b2e1 100644 --- a/inputstream.adaptive/addon.xml.in +++ b/inputstream.adaptive/addon.xml.in @@ -1,7 +1,7 @@ @ADDON_DEPENDS@ @@ -15,6 +15,9 @@ @PLATFORM@ +v19.0.1 (2021-12-10) +- Fix compile error by GCC 11 + v19.0.0 (2021-09-14) - Change test builds to released 'Kodi 19 Matrix' - Increase version to 19.0.0