commit: 798815cd723550bb4b9141ded9e50c12a74ed3e2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> AuthorDate: Wed Jul 22 16:26:02 2020 +0000 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> CommitDate: Wed Jul 22 16:26:46 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=798815cd
dev-util/cmake: Bump to version 3.18.0. Removed old Filter out distcc warnings Thanks-to: Felix W. <felix.wischke <AT> 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 <AT> gentoo.org> dev-util/cmake/Manifest | 2 +- .../{cmake-3.18.0_rc4.ebuild => cmake-3.18.0.ebuild} | 2 ++ .../files/cmake-3.18.0-filter_distcc_warning.patch | 17 +++++++++++++++++ 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest index d8519593884..12c70370a97 100644 --- a/dev-util/cmake/Manifest +++ b/dev-util/cmake/Manifest @@ -2,4 +2,4 @@ DIST cmake-3.13.5.tar.gz 8618821 BLAKE2B 765678bc92821207c53bfb4ac995a791b938f20 DIST cmake-3.16.5.tar.gz 9111262 BLAKE2B 5f996113a4979563d7b9f298b4b1a32d6f91eebaa79af42e1cbf247884e443de47e30030fd0f16c7755c4086e2bff0c0741911753ea7c889b68c393c0b98c876 SHA512 204ce83501c8068ff660c30a68641a354764135e1600a9a95b39476d072876e400961377e19bbe03a7b18412b36dcf21a693946a2a81cff5985e637e9f193671 DIST cmake-3.17.2.tar.gz 9469251 BLAKE2B 85818c6346ee600a0185687809b666a3186831d590680bba8a41d6d52cd3852ce84fdac240100a7b91f06897a779e1e44b67d9a8da4e806347c9a4a46dab354d SHA512 4998ec3ac7367cec237187b1568a1935b402c39959c1869c9ae94e013060f6d2e03089eba34187f91063de169df78425dee2aa01acb925347aeb97f99bcad6a2 DIST cmake-3.17.3.tar.gz 9470753 BLAKE2B a4c863e0cf7105eb47e1bba7641ab3431506f0a4f5c84a4de203cb996e629d1ee236d91ba5e1439f0123ab3c8b3871ef4e3b1c21940aa97c125cc7ab2a3f9873 SHA512 13479bd48ef8a8c95277a62b4f42e63152a5979292a98b5456022ca42ad3963cad75e917cc8b92a8485dbf5a2b59cde3fdc90fd9abdb806bc97c8570d03c1c69 -DIST cmake-3.18.0-rc4.tar.gz 8970935 BLAKE2B c3d86e409c88c7e51cc0a4fd54058c511974cd1bfe2162db591a91054aef623c7d0e0e33ec2af9d4831ee0160f7f8202c2a71afd0b23443573b20095b19fb04a SHA512 cd9ced16a9aa6b5b551fb2c50c4b6765d2d5e2be3cd6b4f93fc72243c65755a4c7e51c6fe5abbba556ba971978cf483238f0c58c08083c92bdf66726a3207a08 +DIST cmake-3.18.0.tar.gz 8970116 BLAKE2B 3eba331eaa6b1d85baa5898836fc6106f2b5fcb10af85121806c429f41d09d4fde49bf87ef833c0e538ae5ccdf994e9cc86efa39b571ebcd429459ea37205c66 SHA512 6cab76a792a7ed2120a50048312273b2870afef29351a3ebcbf76cbcb422f82be679c85211c19016a56ac7f63bbce6cea0478f491c973b8577e08168a1ba853d diff --git a/dev-util/cmake/cmake-3.18.0_rc4.ebuild b/dev-util/cmake/cmake-3.18.0.ebuild similarity index 98% rename from dev-util/cmake/cmake-3.18.0_rc4.ebuild rename to dev-util/cmake/cmake-3.18.0.ebuild index 3834479c503..c95cd8652c8 100644 --- a/dev-util/cmake/cmake-3.18.0_rc4.ebuild +++ b/dev-util/cmake/cmake-3.18.0.ebuild @@ -66,6 +66,8 @@ PATCHES=( "${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch "${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch + "${FILESDIR}"/${PN}-3.18.0-filter_distcc_warning.patch #691544 + # upstream fixes (can usually be removed with a version bump) ) 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 00000000000..07d89ee5e2b --- /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. <[email protected]> + +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)
