user/rttr: remove '-Werror' flag. fixes #1196.zv/gcc-next

This replaces '-Werror' with '-Wextra' for more verbosity
without causing the built to fail on warnings.

3 files changed, 18 insertions, 105 deletions

diff --git a/user/rttr/APKBUILD b/user/rttr/APKBUILD
index 3986fc6a4..7142ef646 100644
--- a/user/rttr/APKBUILD
+++ b/user/rttr/APKBUILD
@@ -18,7 +18,7 @@ source="https://github.com/rttrorg/rttr/releases/download/v$pkgver/rttr-$pkgver-
 	header.patch
 	clang.patch
 	no-pessimising-moves.patch
-	gcc9.patch
+	show-warnings-not-error-out.patch
 	"
 
 build() {
@@ -51,4 +51,4 @@ sha512sums="7e0d4fa87f83feda0b926d4d0e52aaf0f369f25fe7e23e5ffe86c0bba159e8353cef
 75ff5e06f92c94db6b7c04846bfff1dcde22b81831a40ad7533cd93fc9ca300c76ca1266081ac4784bc3b94a8b805db28b841702b10d66232c1110d57c812245  header.patch
 3bbdc8feb9b64b4a9f0db138ea0612e3e5a57004fda8b856c30a5f05824009543f396654c6ef3b6e157ce62c7057a239029dd35c749387d9ad91dcc4ac2c00e4  clang.patch
 3e7f81db25f0af6a3924e693d30cb5895fbc13dd3eac752d66082ae34c08fc779de086764f63f52170399cb85c5cf87ef182bdc8d8f054fd7f085bc90e779dc8  no-pessimising-moves.patch
-2dda29b06484bfad15fefe919bce30ab1b6a6f0b9aec10a09736e1018565151cb675874484b4bb573d27d0742fe5943e002074cfa9f822fc1d3888fd3c8a9dc0  gcc9.patch"
+f42539edff3b08cf2938a489a9163e3ab81fd43422de1b22a23bae8ef198554f46b5ded4e6f09fb2840fbdd711385563bedcdbb9238569ff7c9484b84eb7bc53  show-warnings-not-error-out.patch"
diff --git a/user/rttr/gcc9.patch b/user/rttr/gcc9.patch
deleted file mode 100644
index 4e438859e..000000000
--- a/user/rttr/gcc9.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-From 7edbd580cfad509a3253c733e70144e36f02ecd4 Mon Sep 17 00:00:00 2001
-From: Axel Menzel <info@axelmenzel.de>
-Date: Sun, 8 Aug 2021 12:27:15 +0200
-Subject: [PATCH] add github actions workflow & disable gcc9 warnings
-
-Additional: disable initializer list warning
----
- .github/workflows/linux.yml                   | 23 +++++++++++++++++++
- src/rttr/detail/base/core_prerequisites.h     | 15 ++++++++++++
- src/rttr/detail/variant/variant_data_policy.h |  3 ++-
- 3 files changed, 40 insertions(+), 1 deletion(-)
- create mode 100644 .github/workflows/linux.yml
-
-diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
-new file mode 100644
-index 00000000..c232943e
---- /dev/null
-+++ b/.github/workflows/linux.yml
-@@ -0,0 +1,23 @@
-+name: Linux
-+
-+on: [push]
-+env:
-+  # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
-+  BUILD_TYPE: Release
-+
-+jobs:
-+  build:
-+    runs-on: ubuntu-latest
-+
-+    steps:
-+    - uses: actions/checkout@v2
-+    - uses: seanmiddleditch/gha-setup-ninja@master
-+
-+    - name: Configure CMake
-+      run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DBUILD_EXAMPLES=OFF -G Ninja
-+
-+    - name: Build
-+      run: cmake --build ${{github.workspace}}/build
-+
-+    - name: Test
-+      run: cmake --build ${{github.workspace}}/build --target run_tests
-diff --git a/src/rttr/detail/base/core_prerequisites.h b/src/rttr/detail/base/core_prerequisites.h
-index 6aa29d77..601ddeb9 100644
---- a/src/rttr/detail/base/core_prerequisites.h
-+++ b/src/rttr/detail/base/core_prerequisites.h
-@@ -278,6 +278,15 @@ namespace rttr
- #   define RTTR_END_DISABLE_OVERRIDE_WARNING
- #endif
- 
-+#if RTTR_COMP_VER >= 900
-+#   define RTTR_BEGIN_DISABLE_INIT_LIST_WARNING       _Pragma ("GCC diagnostic push") \
-+                                                      _Pragma ("GCC diagnostic ignored \"-Winit-list-lifetime\"")
-+#   define RTTR_END_DISABLE_INIT_LIST_WARNING         _Pragma ("GCC diagnostic pop")
-+# else
-+#   define RTTR_BEGIN_DISABLE_INIT_LIST_WARNING
-+#   define RTTR_END_DISABLE_INIT_LIST_WARNING
-+#endif
-+
- #   define RTTR_DECLARE_PLUGIN_CTOR       __attribute__((constructor))
- #   define RTTR_DECLARE_PLUGIN_DTOR       __attribute__((destructor))
- 
-@@ -313,6 +322,10 @@ namespace rttr
- #   define RTTR_END_DISABLE_OVERRIDE_WARNING
- #endif
- 
-+
-+#   define RTTR_BEGIN_DISABLE_INIT_LIST_WARNING
-+#   define RTTR_END_DISABLE_INIT_LIST_WARNING
-+
- #   define RTTR_DECLARE_PLUGIN_CTOR        __attribute__((__constructor__))
- #   define RTTR_DECLARE_PLUGIN_DTOR        __attribute__((__destructor__))
- 
-@@ -332,6 +345,8 @@ namespace rttr
- #   define RTTR_DECLARE_PLUGIN_DTOR
- #   define RTTR_BEGIN_DISABLE_OVERRIDE_WARNING
- #   define RTTR_END_DISABLE_OVERRIDE_WARNING
-+#   define RTTR_BEGIN_DISABLE_INIT_LIST_WARNING
-+#   define RTTR_END_DISABLE_INIT_LIST_WARNING
- 
- #else
- #   pragma message("WARNING: unknown compiler, don't know how to disable deprecated warnings")
-diff --git a/src/rttr/detail/variant/variant_data_policy.h b/src/rttr/detail/variant/variant_data_policy.h
-index 39dbb2f9..8eeaafbe 100644
---- a/src/rttr/detail/variant/variant_data_policy.h
-+++ b/src/rttr/detail/variant/variant_data_policy.h
-@@ -434,7 +434,7 @@ struct variant_data_policy_big : variant_data_base_policy<T, variant_data_policy
-     {
-         delete &value;
-     }
--
-+RTTR_BEGIN_DISABLE_INIT_LIST_WARNING
-     static RTTR_INLINE void clone(const T& value, variant_data& dest)
-     {
-         reinterpret_cast<T*&>(dest) = new T(value);
-@@ -450,6 +450,7 @@ struct variant_data_policy_big : variant_data_base_policy<T, variant_data_policy
-     {
-         reinterpret_cast<T*&>(dest) = new T(std::forward<U>(value));
-     }
-+RTTR_END_DISABLE_INIT_LIST_WARNING
- };
- 
- /////////////////////////////////////////////////////////////////////////////////////////
diff --git a/user/rttr/show-warnings-not-error-out.patch b/user/rttr/show-warnings-not-error-out.patch
new file mode 100644
index 000000000..11d332048
--- /dev/null
+++ b/user/rttr/show-warnings-not-error-out.patch
@@ -0,0 +1,16 @@
+diff -ur a/CMake/utility.cmake b/CMake/utility.cmake
+--- a/CMake/utility.cmake	2024-06-04 17:45:24.308248159 +0000
++++ b/CMake/utility.cmake	2024-06-04 17:46:10.476409691 +0000
+@@ -392,10 +392,10 @@
+ ####################################################################################
+ function( set_compiler_warnings target)
+   if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+-    set(WARNINGS "-Werror"
++    set(WARNINGS "-Wextra"
+                  "-Wall")
+   elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+-    set(WARNINGS "-Werror"
++    set(WARNINGS "-Wextra"
+                  "-Wall")
+   elseif(MSVC)
+     set(WARNINGS "/WX"