From 7c7c2c9727d6b2ff30945b5aea0d575e1c406d8b Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 2 May 2018 14:13:35 +0100 Subject: gentoo resync : 02.05.2018 --- ...gsl-0_pre20180108-use_system_catch-636828.patch | 21 ------------- ...s-gsl-0_pre20180304-disable_Werror-644042.patch | 27 ----------------- .../files/ms-gsl-1.0.0-disable_Werror-644042.patch | 35 ++++++++++++++++++++++ .../ms-gsl-1.0.0-use_system_catch-636828.patch | 21 +++++++++++++ 4 files changed, 56 insertions(+), 48 deletions(-) delete mode 100644 dev-cpp/ms-gsl/files/ms-gsl-0_pre20180108-use_system_catch-636828.patch delete mode 100644 dev-cpp/ms-gsl/files/ms-gsl-0_pre20180304-disable_Werror-644042.patch create mode 100644 dev-cpp/ms-gsl/files/ms-gsl-1.0.0-disable_Werror-644042.patch create mode 100644 dev-cpp/ms-gsl/files/ms-gsl-1.0.0-use_system_catch-636828.patch (limited to 'dev-cpp/ms-gsl/files') diff --git a/dev-cpp/ms-gsl/files/ms-gsl-0_pre20180108-use_system_catch-636828.patch b/dev-cpp/ms-gsl/files/ms-gsl-0_pre20180108-use_system_catch-636828.patch deleted file mode 100644 index 12d92605dda8..000000000000 --- a/dev-cpp/ms-gsl/files/ms-gsl-0_pre20180108-use_system_catch-636828.patch +++ /dev/null @@ -1,21 +0,0 @@ -Add CMake option to disable upstream's catch download, we always want to use the -system wide installed version. Gentoo bug 636828. - -diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt -index 86ce5a4..b36df56 100644 ---- a/tests/CMakeLists.txt -+++ b/tests/CMakeLists.txt -@@ -10,7 +10,9 @@ list(APPEND CATCH_CMAKE_ARGS - "-DNO_SELFTEST=true" - ) - --if(GIT_FOUND) -+option(FORCE_SYSTEM_CATCH "Force usage of system-wide catch install" OFF) -+ -+if(NOT ${FORCE_SYSTEM_CATCH} AND GIT_FOUND) - # add catch - ExternalProject_Add( - catch --- -2.13.6 - diff --git a/dev-cpp/ms-gsl/files/ms-gsl-0_pre20180304-disable_Werror-644042.patch b/dev-cpp/ms-gsl/files/ms-gsl-0_pre20180304-disable_Werror-644042.patch deleted file mode 100644 index 9d2a43c223f3..000000000000 --- a/dev-cpp/ms-gsl/files/ms-gsl-0_pre20180304-disable_Werror-644042.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 402dd069acc1944428fd9f4ed3620a157028f6cc Mon Sep 17 00:00:00 2001 -From: Jan Henke -Date: Sat, 17 Mar 2018 19:47:52 +0100 -Subject: [PATCH] Disable -Werror when compiling tests - -GCC 7 generates new warnings on some of the test files, which lead to -build failures. -Werror generally is helpful while developing to enforce -a zero error policy, but not so much when packaging. Gentoo bug 644042 ---- - tests/CMakeLists.txt | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt -index 0e08d77..86e9af7 100644 ---- a/tests/CMakeLists.txt -+++ b/tests/CMakeLists.txt -@@ -41,7 +41,6 @@ target_compile_options(gsl_tests_config INTERFACE - -Wcast-align - -Wconversion - -Wctor-dtor-privacy -- -Werror - -Wextra - -Wno-missing-braces - -Wnon-virtual-dtor --- -2.16.1 - diff --git a/dev-cpp/ms-gsl/files/ms-gsl-1.0.0-disable_Werror-644042.patch b/dev-cpp/ms-gsl/files/ms-gsl-1.0.0-disable_Werror-644042.patch new file mode 100644 index 000000000000..35c8177cad8a --- /dev/null +++ b/dev-cpp/ms-gsl/files/ms-gsl-1.0.0-disable_Werror-644042.patch @@ -0,0 +1,35 @@ +From 683aacce5b642a3c735f8040601e0de345d028da Mon Sep 17 00:00:00 2001 +From: Jan Henke +Date: Sat, 17 Mar 2018 19:47:52 +0100 +Subject: [PATCH] Disable -WError when compiling tests + +GCC 7 generates new warnings on some of the test files, which lead to +build failures. -WError generally is helpful while developing to enforce +a zero error policy, but not so much when packaging. Gentoo bug 644042 +--- + tests/CMakeLists.txt | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt +index 0e08d77..86e9af7 100644 +--- a/tests/CMakeLists.txt ++++ b/tests/CMakeLists.txt +@@ -41,7 +41,6 @@ target_compile_options(gsl_tests_config INTERFACE + -Wcast-align + -Wconversion + -Wctor-dtor-privacy +- -Werror + -Wextra + -Wno-missing-braces + -Wnon-virtual-dtor +@@ -129,7 +128,6 @@ target_compile_options(gsl_tests_config_noexcept INTERFACE + -Wcast-align + -Wconversion + -Wctor-dtor-privacy +- -Werror + -Wextra + -Wno-missing-braces + -Wnon-virtual-dtor +-- +2.16.1 + diff --git a/dev-cpp/ms-gsl/files/ms-gsl-1.0.0-use_system_catch-636828.patch b/dev-cpp/ms-gsl/files/ms-gsl-1.0.0-use_system_catch-636828.patch new file mode 100644 index 000000000000..12d92605dda8 --- /dev/null +++ b/dev-cpp/ms-gsl/files/ms-gsl-1.0.0-use_system_catch-636828.patch @@ -0,0 +1,21 @@ +Add CMake option to disable upstream's catch download, we always want to use the +system wide installed version. Gentoo bug 636828. + +diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt +index 86ce5a4..b36df56 100644 +--- a/tests/CMakeLists.txt ++++ b/tests/CMakeLists.txt +@@ -10,7 +10,9 @@ list(APPEND CATCH_CMAKE_ARGS + "-DNO_SELFTEST=true" + ) + +-if(GIT_FOUND) ++option(FORCE_SYSTEM_CATCH "Force usage of system-wide catch install" OFF) ++ ++if(NOT ${FORCE_SYSTEM_CATCH} AND GIT_FOUND) + # add catch + ExternalProject_Add( + catch +-- +2.13.6 + -- cgit v1.2.3