summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wendler <polynomial-c@gentoo.org>2020-07-22 18:26:02 +0200
committerLars Wendler <polynomial-c@gentoo.org>2020-07-22 18:26:46 +0200
commit798815cd723550bb4b9141ded9e50c12a74ed3e2 (patch)
tree21fcfcc1d86f43f03e79cd8ddee35cebab1e924b /dev-util/cmake/files
parentapp-office/wps-office: Drop old (diff)
downloadgentoo-798815cd723550bb4b9141ded9e50c12a74ed3e2.tar.gz
gentoo-798815cd723550bb4b9141ded9e50c12a74ed3e2.tar.bz2
gentoo-798815cd723550bb4b9141ded9e50c12a74ed3e2.zip
dev-util/cmake: Bump to version 3.18.0. Removed old
Filter out distcc warnings Thanks-to: Felix W. <felix.wischke@gmail.com> Bug: https://bugs.gentoo.org/691544 Package-Manager: Portage-3.0.0, Repoman-2.3.23 Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
Diffstat (limited to 'dev-util/cmake/files')
-rw-r--r--dev-util/cmake/files/cmake-3.18.0-filter_distcc_warning.patch17
1 files changed, 17 insertions, 0 deletions
diff --git a/dev-util/cmake/files/cmake-3.18.0-filter_distcc_warning.patch b/dev-util/cmake/files/cmake-3.18.0-filter_distcc_warning.patch
new file mode 100644
index 000000000000..07d89ee5e2b4
--- /dev/null
+++ b/dev-util/cmake/files/cmake-3.18.0-filter_distcc_warning.patch
@@ -0,0 +1,17 @@
+https://bugs.gentoo.org/691544
+
+Patch-by: Felix W. <felix.wischke@gmail.com>
+
+Forward-ported from 3.16.5 to 3.18.0
+
+--- cmake-3.18.0/Source/Checks/cm_cxx_features.cmake
++++ cmake-3.18.0/Source/Checks/cm_cxx_features.cmake
+@@ -36,6 +36,8 @@
+ string(REGEX REPLACE "[^\n]*icpc: command line warning #10121: overriding [^\n]*" "" check_output "${check_output}")
+ # Filter out ld warnings.
+ string(REGEX REPLACE "[^\n]*ld: warning: [^\n]*" "" check_output "${check_output}")
++ # Filter out distcc.
++ string(REGEX REPLACE "[^\n]*distcc\\[[0-9]+\\][^\n]*[Ww]arning:[^\n]*" "" check_output "${check_output}")
+ # If using the feature causes warnings, treat it as broken/unavailable.
+ if(check_output MATCHES "(^|[ :])[Ww][Aa][Rr][Nn][Ii][Nn][Gg]")
+ set(CMake_HAVE_CXX_${FEATURE} OFF CACHE INTERNAL "TRY_COMPILE" FORCE)