From f149f52acc5d43f835b32567d43f3d487f59f14260a259697d42a81808a34af9 Mon Sep 17 00:00:00 2001 From: Simon Lees Date: Thu, 17 Aug 2023 02:09:25 +0000 Subject: [PATCH 1/6] Accepting request 1104229 from home:jengelh:branches:devel:tools:building - Make %cmake_build insert RELWITHDEBINFO CFLAGS as well to avoid projects overriding our %optflags with some cmake default. OBS-URL: https://build.opensuse.org/request/show/1104229 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=547 --- cmake.changes | 6 ++++++ cmake.macros | 3 +++ 2 files changed, 9 insertions(+) diff --git a/cmake.changes b/cmake.changes index 31b4dda..9bdd281 100644 --- a/cmake.changes +++ b/cmake.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Aug 16 17:44:46 UTC 2023 - Jan Engelhardt + +- Make %cmake_build insert RELWITHDEBINFO CFLAGS as well to avoid + projects overriding our %optflags with some cmake default. + ------------------------------------------------------------------- Sat Aug 12 12:38:42 UTC 2023 - Christoph G diff --git a/cmake.macros b/cmake.macros index 10cd1f7..3fb5f11 100644 --- a/cmake.macros +++ b/cmake.macros @@ -38,8 +38,11 @@ -DSHARE_INSTALL_PREFIX:PATH=%{_datadir} \\\ -DCMAKE_BUILD_TYPE=RelWithDebInfo \\\ -DCMAKE_C_FLAGS="${CFLAGS:-%optflags}" \\\ + -DCMAKE_C_FLAGS_RELWITHDEBINFO="${CFLAGS:-%optflags}" \\\ -DCMAKE_CXX_FLAGS="${CXXFLAGS:-%optflags}" \\\ + -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="${CXXFLAGS:-%optflags}" \\\ -DCMAKE_Fortran_FLAGS="${FFLAGS:-%optflags%{?_fmoddir: -I%_fmoddir}}" \\\ + -DCMAKE_Fortran_FLAGS_RELWITHDEBINFO="${FFLAGS:-%optflags%{?_fmoddir: -I%_fmoddir}}" \\\ -DCMAKE_EXE_LINKER_FLAGS="%{?build_ldflags} -Wl,--as-needed -Wl,-z,now" \\\ -DCMAKE_MODULE_LINKER_FLAGS="%{?build_ldflags} -Wl,--as-needed" \\\ -DCMAKE_SHARED_LINKER_FLAGS="%{?build_ldflags} -Wl,--as-needed -Wl,-z,now" \\\ From 18e54a0c8f6d7bd2edbe496af80f31dacc31d2e069f49986aea7fbf1481e664d Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Mon, 28 Aug 2023 08:33:24 +0000 Subject: [PATCH 2/6] Accepting request 1105508 from home:AndreasStieger:branches:devel:tools:building cmake 3.27.4 OBS-URL: https://build.opensuse.org/request/show/1105508 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=548 --- cmake-3.27.2-SHA-256.txt | 17 ----------------- cmake-3.27.2-SHA-256.txt.asc | 16 ---------------- cmake-3.27.2.tar.gz | 3 --- cmake-3.27.4-SHA-256.txt | 17 +++++++++++++++++ cmake-3.27.4-SHA-256.txt.asc | 16 ++++++++++++++++ cmake-3.27.4.tar.gz | 3 +++ cmake.changes | 8 ++++++++ cmake.spec | 2 +- 8 files changed, 45 insertions(+), 37 deletions(-) delete mode 100644 cmake-3.27.2-SHA-256.txt delete mode 100644 cmake-3.27.2-SHA-256.txt.asc delete mode 100644 cmake-3.27.2.tar.gz create mode 100644 cmake-3.27.4-SHA-256.txt create mode 100644 cmake-3.27.4-SHA-256.txt.asc create mode 100644 cmake-3.27.4.tar.gz diff --git a/cmake-3.27.2-SHA-256.txt b/cmake-3.27.2-SHA-256.txt deleted file mode 100644 index 5cc9403..0000000 --- a/cmake-3.27.2-SHA-256.txt +++ /dev/null @@ -1,17 +0,0 @@ -ef049138e53421046f18d2a81f200ce9a0d969325a35f2f69661707d99236bb2 cmake-3.27.2-files-v1.json -39e406c2fc8cabc561dbc59be20d0521eaa8a05f9f4481c3f46aed7fdd0f581d cmake-3.27.2-linux-aarch64.sh -4d9c6186987f681a08704b0109c842b1dde887fefe5505e860499859e54c7d67 cmake-3.27.2-linux-aarch64.tar.gz -2e10614ec44e30a1013ae954b6a8f350bfae78f306d2b49fddec6e8d32c5c809 cmake-3.27.2-linux-x86_64.sh -89c30078a5f58bbbd524704cb87e724fca905aa5e71ac40bccc6295c4d6852c9 cmake-3.27.2-linux-x86_64.tar.gz -f55d3527625af7da466e63d69ac88c5066428419a2a1202430dccbb8fcf79df1 cmake-3.27.2-macos-universal.dmg -282c0c6764a8548a45a108174eb4b8a8787df1b61f69c1212003c80f43d6cc95 cmake-3.27.2-macos-universal.tar.gz -7ae65a23cc854cfe7a2be44f73be9b7e040f3875a65fdc510fe4c9c5d80c7e3e cmake-3.27.2-macos10.10-universal.dmg -58204ebe25912dbd56456b265675ea90c60f29745b3f149841e9ea4bfcb45158 cmake-3.27.2-macos10.10-universal.tar.gz -645e6f606558b58fa08c5ddf305d8215f51a39bfb88ce9b707923fb694ec9e5e cmake-3.27.2-windows-arm64.msi -8861c264be983da901e6fbfb3a0bebe87f7b1faba92d3805ffe82a013964229b cmake-3.27.2-windows-arm64.zip -4041d897e01b6ac1695fee044b07a1b30f4ef536d742519ae1f07cb1b931e546 cmake-3.27.2-windows-i386.msi -c26e4ba882a94ae24c695b1365f30e75fbea4a65ec0ee36a540f7f9029caf1fd cmake-3.27.2-windows-i386.zip -4493c8a293bddbf74013c95eefa5a6425949a5a956ba03d85d57a2df08167073 cmake-3.27.2-windows-x86_64.msi -d5c33f726f9154f4abdda94e83aabd6de9f37b6b25ecbc9e499a3c5777871d55 cmake-3.27.2-windows-x86_64.zip -798e50085d423816fe96c9ef8bee5e50002c9eca09fed13e300de8a91d35c211 cmake-3.27.2.tar.gz -c88ea100e24b26270db06a3f856af2be5282badfd7f423bc51c26913fc932bca cmake-3.27.2.zip diff --git a/cmake-3.27.2-SHA-256.txt.asc b/cmake-3.27.2-SHA-256.txt.asc deleted file mode 100644 index 2e2bb13..0000000 --- a/cmake-3.27.2-SHA-256.txt.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEExsJlMku+vcNQtRPQLSzvEDSSFoQFAmTVCfcACgkQLSzvEDSS -FoQxQw//Ypm7klyHvwyEMrFafO/51Pd8KX2mooZtRY0AOpuNr1dQYGOgNFJKXWX7 -HhqZfayNOjjWDOLROg4CgLrZm3vxqRWU8grH1o6nhxDyWXEBKOtle8ydK6mT8Eu7 -MqrcfA8nGMuLbgAnmUdcrqYFr+6wmHbwnBsJRV93g6/NwxnrdTWXA/dllWjG5P4n -ktC6iEFgvRaGB6DQeOxmfPODlhtsa1dioa09GFl1sHQK0f5h1kUIVhH/7qrB+Ikj -zztR944yXR7GvnEN+SP7RyyePDMXA78TMnbY+hyKcv49wHEegOB9f0p/qpvbwYa9 -mEuuzX7x3VMCwAvpO914lBTU9c3Flp4aMa5bUF5sodFLZpmuJTxkdh/F5MnHLncU -kBpvvpLOhCupRdHShbiSpgOp8FkAMOqPkRj0inab1qUoACxamJcLOFB6rgIj3ub8 -uc54fqgFWQY9dxF8tzUxU3cGhCbofF6W9YWCeGk1T+Uebclv67dfdEy33JV6uN3i -JZnColsJ/J+NaqNIR9FD5nRNEy0haOOCiM+NMEXgVGFtl3YmgX7G3whOc5hVzUhe -jvScALQ1aYHdHoxIP/kION5mI0qCRNINe7rpmDXXA6osxeidB2dhrYt9hEO/sTNw -ScmHb5kV31UECahR2WxyBC+R/BJoj+WjwIAITbdLOtJP0FWLJyo= -=/Frn ------END PGP SIGNATURE----- diff --git a/cmake-3.27.2.tar.gz b/cmake-3.27.2.tar.gz deleted file mode 100644 index a1c8646..0000000 --- a/cmake-3.27.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:798e50085d423816fe96c9ef8bee5e50002c9eca09fed13e300de8a91d35c211 -size 10978264 diff --git a/cmake-3.27.4-SHA-256.txt b/cmake-3.27.4-SHA-256.txt new file mode 100644 index 0000000..0b52124 --- /dev/null +++ b/cmake-3.27.4-SHA-256.txt @@ -0,0 +1,17 @@ +72901c8c3410ecafbb8d8ae8717918e1cbb5eaee77c39ed9e75ae77aa9b6ee91 cmake-3.27.4-files-v1.json +fd70e3b3ca0deacb7649704074d1f25d527e57c5aeb17d616f3fe1d60b5020d7 cmake-3.27.4-linux-aarch64.sh +45538d394bd4ef2a423fa78dff5cad16bcf437a4a6dc655e999177170632b039 cmake-3.27.4-linux-aarch64.tar.gz +3c1af5d2375b00d0969b7295cfcd65c02e38ffc0629539ae40f0a46f8fec462b cmake-3.27.4-linux-x86_64.sh +186c53121cf6ef4e48b51e88690e6ef84f268611064a42e5a2e829c3d6b2efde cmake-3.27.4-linux-x86_64.tar.gz +84b0117a846a975e819124219bc23d02d538db978285058cfc0d591dfc116674 cmake-3.27.4-macos-universal.dmg +ce15cc7ae327576a4940c816d18c75eb1b0cf7ce167604bba6b1ef6c01d03ab9 cmake-3.27.4-macos-universal.tar.gz +01f764012bf65aaa29e9b695a312d04668004af9fed0b35a807028c14ba00fb1 cmake-3.27.4-macos10.10-universal.dmg +1fa092bad6daf9715c6d72ff766813fd3423427696042a74f2208a2b4704ac1c cmake-3.27.4-macos10.10-universal.tar.gz +a520820286755cf5a7d26f0bad268e784dcfc20ce69e106804972c2db53329d8 cmake-3.27.4-windows-arm64.msi +6c1df7ad85ed902ad615cd0c05bca0d3c9c3f67b3980ca9dd2e39b0821d50937 cmake-3.27.4-windows-arm64.zip +16526a45c3bee1543614c43e9ccdda4e6e68144fdc97b8b09386f5b6870ce866 cmake-3.27.4-windows-i386.msi +5ffd1db389cc8d4bad39c220d73c52402cb979d4e36e1e4729e00df6e7e6f1de cmake-3.27.4-windows-i386.zip +0e51576f5c2b3be1172939919fb30a821a7b5520f5a7b5626c2d10c6e3f0292c cmake-3.27.4-windows-x86_64.msi +e5e060756444d0b2070328a8821c1ceb62bd6d267aae61bfff06f96c7ec943a6 cmake-3.27.4-windows-x86_64.zip +0a905ca8635ca81aa152e123bdde7e54cbe764fdd9a70d62af44cad8b92967af cmake-3.27.4.tar.gz +83601005152e77a6e885b62740ce25e6c1a6efae5e6d48d7c2c89e5a92b01c89 cmake-3.27.4.zip diff --git a/cmake-3.27.4-SHA-256.txt.asc b/cmake-3.27.4-SHA-256.txt.asc new file mode 100644 index 0000000..b392d42 --- /dev/null +++ b/cmake-3.27.4-SHA-256.txt.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEExsJlMku+vcNQtRPQLSzvEDSSFoQFAmTmDxwACgkQLSzvEDSS +FoSQig//apLhviY+cUrys+8P2+6KD0iB6jE9HPmJKPe2y/dPGGyTlDxOeTz7ohbi +6M6kuJIhaaiU91RO3/ru3FDkXCclBYXLng/ZiIi2GGgx0KWRxT9eamVfdfEg8LWX ++w7mLmt+x0TMSIClf7tW7+m5laKWi/V8usK3Z+bZH9qIdqWUut9gN8gnfUA7/kYB +wPNPHuwNuxH3L8eZAQ8tSXLvBMCDzykCek9KEyFDmaq+wwR/0N19pFPjj1db71b9 +bZCsD2+D9gBR9kAMlhMOfZkVRxSEzBdkn19gCSK1Acztg9EZKnf3sDTlNkLfqlMl +C6mfKOk5fuuWkNC91SGFgiHNhnprxcUE/OlnxDf8Qq5QXvpQdbBuNfsQR3kr8EOV +RHztjfewLxxEApcaPMnUa6+8leZCZ0dOd9MIXmgU9BEHl/KQQnOzepVgJ4i8HstN +DxpBtar0oAxNTa4G+9ZmOhY7/fxg2kCjRqWGbYCzLvzYnl9GOuXuBLgNNzoie7QF +xU8gc4JMQgJ/uptobcBYo4z6UDsg7CdjfsDd+W1wkSf/WqkIZMa3a2O4fTneFHd5 +QDmsx5CSIdB7vURz9EiIJRYMnQ4u51cw12abPQcNLEEckyXIgvodTogUikH85W0S +nWmCuisXa44w7gQmy+4DypAmP52sAWP4yjb67pwIRAxcoeHBy9c= +=Sqf8 +-----END PGP SIGNATURE----- diff --git a/cmake-3.27.4.tar.gz b/cmake-3.27.4.tar.gz new file mode 100644 index 0000000..d92b75f --- /dev/null +++ b/cmake-3.27.4.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0a905ca8635ca81aa152e123bdde7e54cbe764fdd9a70d62af44cad8b92967af +size 10980052 diff --git a/cmake.changes b/cmake.changes index 9bdd281..ecebc66 100644 --- a/cmake.changes +++ b/cmake.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Aug 23 20:04:25 UTC 2023 - Andreas Stieger + +- update to 3.27.4: + * Fix support for Intel compiler with modern GNU system compiler + * Graphviz: Restore support for per-target dependency graph options + * FindOpenSSL: Fix OpenSSL 3.0.0 version extraction + ------------------------------------------------------------------- Wed Aug 16 17:44:46 UTC 2023 - Jan Engelhardt diff --git a/cmake.spec b/cmake.spec index b2c4f30..66ad421 100644 --- a/cmake.spec +++ b/cmake.spec @@ -46,7 +46,7 @@ %endif %define shortversion 3.27 Name: cmake%{?psuffix} -Version: 3.27.2 +Version: 3.27.4 Release: 0 Summary: Cross-platform make system License: BSD-3-Clause From 30076be1e59377c3e8125cf87a08b555cf4441b799efda0fc655fb47c33e3e62 Mon Sep 17 00:00:00 2001 From: Simon Lees Date: Fri, 15 Sep 2023 07:24:47 +0000 Subject: [PATCH 3/6] Accepting request 1111436 from home:polslinux:branches:devel:tools:building - update to 3.27.5: * cmGeneratorTarget: support config-independent Fortran source queries * cmComputeLinkInformation: compute link info for module-using targets * FortranCInterface: forward CMAKE_OSX_DEPLOYMENT_TARGET * cxxmodules: detect and message about non-compiled sources * Source: Link libatomic when needed on any Linux architecture * Help: MSVC_DEBUG_INFORMATION_FORMAT is initialized from associated variable * FindBoost: Add support for Boost 1.83 * Autogen: Evaluate INTERFACE_AUTOMOC_MACRO_NAMES efficiently * VS: Avoid unnecessary CUDA device linking for OBJECT libraries OBS-URL: https://build.opensuse.org/request/show/1111436 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=549 --- cmake-3.27.4-SHA-256.txt | 17 ----------------- cmake-3.27.4-SHA-256.txt.asc | 16 ---------------- cmake-3.27.4.tar.gz | 3 --- cmake-3.27.5-SHA-256.txt | 17 +++++++++++++++++ cmake-3.27.5-SHA-256.txt.asc | 16 ++++++++++++++++ cmake-3.27.5.tar.gz | 3 +++ cmake.changes | 14 ++++++++++++++ cmake.spec | 2 +- 8 files changed, 51 insertions(+), 37 deletions(-) delete mode 100644 cmake-3.27.4-SHA-256.txt delete mode 100644 cmake-3.27.4-SHA-256.txt.asc delete mode 100644 cmake-3.27.4.tar.gz create mode 100644 cmake-3.27.5-SHA-256.txt create mode 100644 cmake-3.27.5-SHA-256.txt.asc create mode 100644 cmake-3.27.5.tar.gz diff --git a/cmake-3.27.4-SHA-256.txt b/cmake-3.27.4-SHA-256.txt deleted file mode 100644 index 0b52124..0000000 --- a/cmake-3.27.4-SHA-256.txt +++ /dev/null @@ -1,17 +0,0 @@ -72901c8c3410ecafbb8d8ae8717918e1cbb5eaee77c39ed9e75ae77aa9b6ee91 cmake-3.27.4-files-v1.json -fd70e3b3ca0deacb7649704074d1f25d527e57c5aeb17d616f3fe1d60b5020d7 cmake-3.27.4-linux-aarch64.sh -45538d394bd4ef2a423fa78dff5cad16bcf437a4a6dc655e999177170632b039 cmake-3.27.4-linux-aarch64.tar.gz -3c1af5d2375b00d0969b7295cfcd65c02e38ffc0629539ae40f0a46f8fec462b cmake-3.27.4-linux-x86_64.sh -186c53121cf6ef4e48b51e88690e6ef84f268611064a42e5a2e829c3d6b2efde cmake-3.27.4-linux-x86_64.tar.gz -84b0117a846a975e819124219bc23d02d538db978285058cfc0d591dfc116674 cmake-3.27.4-macos-universal.dmg -ce15cc7ae327576a4940c816d18c75eb1b0cf7ce167604bba6b1ef6c01d03ab9 cmake-3.27.4-macos-universal.tar.gz -01f764012bf65aaa29e9b695a312d04668004af9fed0b35a807028c14ba00fb1 cmake-3.27.4-macos10.10-universal.dmg -1fa092bad6daf9715c6d72ff766813fd3423427696042a74f2208a2b4704ac1c cmake-3.27.4-macos10.10-universal.tar.gz -a520820286755cf5a7d26f0bad268e784dcfc20ce69e106804972c2db53329d8 cmake-3.27.4-windows-arm64.msi -6c1df7ad85ed902ad615cd0c05bca0d3c9c3f67b3980ca9dd2e39b0821d50937 cmake-3.27.4-windows-arm64.zip -16526a45c3bee1543614c43e9ccdda4e6e68144fdc97b8b09386f5b6870ce866 cmake-3.27.4-windows-i386.msi -5ffd1db389cc8d4bad39c220d73c52402cb979d4e36e1e4729e00df6e7e6f1de cmake-3.27.4-windows-i386.zip -0e51576f5c2b3be1172939919fb30a821a7b5520f5a7b5626c2d10c6e3f0292c cmake-3.27.4-windows-x86_64.msi -e5e060756444d0b2070328a8821c1ceb62bd6d267aae61bfff06f96c7ec943a6 cmake-3.27.4-windows-x86_64.zip -0a905ca8635ca81aa152e123bdde7e54cbe764fdd9a70d62af44cad8b92967af cmake-3.27.4.tar.gz -83601005152e77a6e885b62740ce25e6c1a6efae5e6d48d7c2c89e5a92b01c89 cmake-3.27.4.zip diff --git a/cmake-3.27.4-SHA-256.txt.asc b/cmake-3.27.4-SHA-256.txt.asc deleted file mode 100644 index b392d42..0000000 --- a/cmake-3.27.4-SHA-256.txt.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEExsJlMku+vcNQtRPQLSzvEDSSFoQFAmTmDxwACgkQLSzvEDSS -FoSQig//apLhviY+cUrys+8P2+6KD0iB6jE9HPmJKPe2y/dPGGyTlDxOeTz7ohbi -6M6kuJIhaaiU91RO3/ru3FDkXCclBYXLng/ZiIi2GGgx0KWRxT9eamVfdfEg8LWX -+w7mLmt+x0TMSIClf7tW7+m5laKWi/V8usK3Z+bZH9qIdqWUut9gN8gnfUA7/kYB -wPNPHuwNuxH3L8eZAQ8tSXLvBMCDzykCek9KEyFDmaq+wwR/0N19pFPjj1db71b9 -bZCsD2+D9gBR9kAMlhMOfZkVRxSEzBdkn19gCSK1Acztg9EZKnf3sDTlNkLfqlMl -C6mfKOk5fuuWkNC91SGFgiHNhnprxcUE/OlnxDf8Qq5QXvpQdbBuNfsQR3kr8EOV -RHztjfewLxxEApcaPMnUa6+8leZCZ0dOd9MIXmgU9BEHl/KQQnOzepVgJ4i8HstN -DxpBtar0oAxNTa4G+9ZmOhY7/fxg2kCjRqWGbYCzLvzYnl9GOuXuBLgNNzoie7QF -xU8gc4JMQgJ/uptobcBYo4z6UDsg7CdjfsDd+W1wkSf/WqkIZMa3a2O4fTneFHd5 -QDmsx5CSIdB7vURz9EiIJRYMnQ4u51cw12abPQcNLEEckyXIgvodTogUikH85W0S -nWmCuisXa44w7gQmy+4DypAmP52sAWP4yjb67pwIRAxcoeHBy9c= -=Sqf8 ------END PGP SIGNATURE----- diff --git a/cmake-3.27.4.tar.gz b/cmake-3.27.4.tar.gz deleted file mode 100644 index d92b75f..0000000 --- a/cmake-3.27.4.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0a905ca8635ca81aa152e123bdde7e54cbe764fdd9a70d62af44cad8b92967af -size 10980052 diff --git a/cmake-3.27.5-SHA-256.txt b/cmake-3.27.5-SHA-256.txt new file mode 100644 index 0000000..57e5011 --- /dev/null +++ b/cmake-3.27.5-SHA-256.txt @@ -0,0 +1,17 @@ +0e298df2d26f6fb17313d98d372093405a3b13fa78024bf8d26304e2e306c868 cmake-3.27.5-files-v1.json +11d7f2d7ef90094d2eda3d178675bb1a45b33b0878b80bb2cd7144475b0720a5 cmake-3.27.5-linux-aarch64.sh +2ffaf176d0f93c332abaffbf3ce82fc8c90e49e0fcee8dc16338bcfbb150ead7 cmake-3.27.5-linux-aarch64.tar.gz +ac28060840a4a239b898cac7641cb54d5ca2065ec329338d6eb8a43f7471629b cmake-3.27.5-linux-x86_64.sh +138c68addae825b16ed78d792dafef5e0960194833f48bd77e7e0429c6bc081c cmake-3.27.5-linux-x86_64.tar.gz +45a3cc9b904a5339a519e3fa1796c734afac789b2b1055b04325493ce7a3658a cmake-3.27.5-macos-universal.dmg +55648dbcec864ab020fbca29fa487439528c8f7161e47c2ad3c29b54dfb7e5eb cmake-3.27.5-macos-universal.tar.gz +b53c251b690ec6e72fde2d3ef433924df8be13481cd85505325032556b0868b1 cmake-3.27.5-macos10.10-universal.dmg +1f776640e6ad35b2b3fe2ab5e39cff363b2c3034ecb56e45597402b7bf010e47 cmake-3.27.5-macos10.10-universal.tar.gz +39f9e45907fadb707cc723f6235c609fe317fcdb255da2f3642dead0abe19361 cmake-3.27.5-windows-arm64.msi +3fcc84d34e3213b0e4261295eaddfc645685ab366dc570421555e7f3d3080d3a cmake-3.27.5-windows-arm64.zip +591d9edf38aec363ffef8b5f48746fbd843f1d781091433343089620e8a4ad20 cmake-3.27.5-windows-i386.msi +cd1225354a5639a992d772f2043a1f0ebadb7ed2d77e0f859e555157410555ce cmake-3.27.5-windows-i386.zip +359db89170adee2413357d23048157f44ceb9aca10777e94b73ed89abab76d67 cmake-3.27.5-windows-x86_64.msi +1e8e06c8ecf63d5f213019e1cd39ea41a6cf952db5f2c8e69b8e47f5bc302684 cmake-3.27.5-windows-x86_64.zip +5175e8fe1ca9b1dd09090130db7201968bcce1595971ff9e9998c2f0765004c9 cmake-3.27.5.tar.gz +3084660c00eec05f7cdc2b6b0e06324692eef57a5e05ab7789d1cefc18de010e cmake-3.27.5.zip diff --git a/cmake-3.27.5-SHA-256.txt.asc b/cmake-3.27.5-SHA-256.txt.asc new file mode 100644 index 0000000..3f44c02 --- /dev/null +++ b/cmake-3.27.5-SHA-256.txt.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEExsJlMku+vcNQtRPQLSzvEDSSFoQFAmUDR+8ACgkQLSzvEDSS +FoQweA/8D3TI5N1RsTlBbxc8lHm4yG48S/TupI187RRc4hPi2uSq1iWmcRr9deuW +pKVBhpzENni8FUAtk4JULxNJlirU/StkBGifjnzd77pju2ezlZbKj1ScNX35EWn6 +HkLKQb91z8Q/mxVDthT+zB9E3HSbR3OLwmb29ZVBXRDfvR428XIf4CfGIWJeNNMI +2i6GXX3zFw8CKoEoOKBDa3PAPo0qYVFLeYxFTellSXCHPcaYCNVu3WikIrqCf1NW +2sbP9S2hxFj+bUAVMlumbIhrQJo6ZvuwqQlYUBxxikMC4iA+BB+wpm7bk3zGLG8A +68tcQkmlcFDlLHv2a2VB2fgLxmFKs/As9QBMZOTTC7ZpE3c3DmttlMc3O6twxxXP +e/Ne+FX8Pl/uutZkSZ/bBwTfm76ZAj+7z8j4bt0mZ7hPh2a99pon4cMmeaY7Tfkl +ilcApkTL1m0sIMH/trdSiEnJJ9onz6N5vE8ukqUmxWga20o2obOkXtS3Q+nmA90J +IqAzai8ack5gHqM4Xo9jNZvi//qBz07m34kNExQTMyeQ0DqdIUPv8bqcDai+7Lrs +m7N1sTAkB2axfhrvEWlzuJNmP0NGMmTH8z6GOXMimbI7bMqF/99igoTpKFumLTzF +Mxpxy409iOjDevdm6XcHM6neJE5cxQyZXRddH95lSYNUMKZZLd8= +=1fU5 +-----END PGP SIGNATURE----- diff --git a/cmake-3.27.5.tar.gz b/cmake-3.27.5.tar.gz new file mode 100644 index 0000000..4a5adc1 --- /dev/null +++ b/cmake-3.27.5.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5175e8fe1ca9b1dd09090130db7201968bcce1595971ff9e9998c2f0765004c9 +size 10981172 diff --git a/cmake.changes b/cmake.changes index ecebc66..8b35cd3 100644 --- a/cmake.changes +++ b/cmake.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Fri Sep 15 05:49:45 UTC 2023 - Paolo Stivanin + +- update to 3.27.5: + * cmGeneratorTarget: support config-independent Fortran source queries + * cmComputeLinkInformation: compute link info for module-using targets + * FortranCInterface: forward CMAKE_OSX_DEPLOYMENT_TARGET + * cxxmodules: detect and message about non-compiled sources + * Source: Link libatomic when needed on any Linux architecture + * Help: MSVC_DEBUG_INFORMATION_FORMAT is initialized from associated variable + * FindBoost: Add support for Boost 1.83 + * Autogen: Evaluate INTERFACE_AUTOMOC_MACRO_NAMES efficiently + * VS: Avoid unnecessary CUDA device linking for OBJECT libraries + ------------------------------------------------------------------- Wed Aug 23 20:04:25 UTC 2023 - Andreas Stieger diff --git a/cmake.spec b/cmake.spec index 66ad421..0de7213 100644 --- a/cmake.spec +++ b/cmake.spec @@ -46,7 +46,7 @@ %endif %define shortversion 3.27 Name: cmake%{?psuffix} -Version: 3.27.4 +Version: 3.27.5 Release: 0 Summary: Cross-platform make system License: BSD-3-Clause From 5ffbae606f292d3390da089eb42a9d2b8423b53778fe7b7491048834031c3c69 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Fri, 13 Oct 2023 08:30:36 +0000 Subject: [PATCH 4/6] Accepting request 1117602 from home:polslinux:branches:devel:tools:building - update to 3.27.7: * Tests: Clarify RunCMake.CTestTimeout case name * ctest: Restore support for --timeout values higher than default test timeout * Help: Document CMP0124 behavior on already-set variables * FindPostgreSQL: Add support for version 16 OBS-URL: https://build.opensuse.org/request/show/1117602 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=550 --- cmake-3.27.5-SHA-256.txt | 17 ----------------- cmake-3.27.5-SHA-256.txt.asc | 16 ---------------- cmake-3.27.5.tar.gz | 3 --- cmake-3.27.7-SHA-256.txt | 17 +++++++++++++++++ cmake-3.27.7-SHA-256.txt.asc | 16 ++++++++++++++++ cmake-3.27.7.tar.gz | 3 +++ cmake.changes | 9 +++++++++ cmake.spec | 2 +- feature-suse-python-interp-search-order.patch | 8 ++++---- 9 files changed, 50 insertions(+), 41 deletions(-) delete mode 100644 cmake-3.27.5-SHA-256.txt delete mode 100644 cmake-3.27.5-SHA-256.txt.asc delete mode 100644 cmake-3.27.5.tar.gz create mode 100644 cmake-3.27.7-SHA-256.txt create mode 100644 cmake-3.27.7-SHA-256.txt.asc create mode 100644 cmake-3.27.7.tar.gz diff --git a/cmake-3.27.5-SHA-256.txt b/cmake-3.27.5-SHA-256.txt deleted file mode 100644 index 57e5011..0000000 --- a/cmake-3.27.5-SHA-256.txt +++ /dev/null @@ -1,17 +0,0 @@ -0e298df2d26f6fb17313d98d372093405a3b13fa78024bf8d26304e2e306c868 cmake-3.27.5-files-v1.json -11d7f2d7ef90094d2eda3d178675bb1a45b33b0878b80bb2cd7144475b0720a5 cmake-3.27.5-linux-aarch64.sh -2ffaf176d0f93c332abaffbf3ce82fc8c90e49e0fcee8dc16338bcfbb150ead7 cmake-3.27.5-linux-aarch64.tar.gz -ac28060840a4a239b898cac7641cb54d5ca2065ec329338d6eb8a43f7471629b cmake-3.27.5-linux-x86_64.sh -138c68addae825b16ed78d792dafef5e0960194833f48bd77e7e0429c6bc081c cmake-3.27.5-linux-x86_64.tar.gz -45a3cc9b904a5339a519e3fa1796c734afac789b2b1055b04325493ce7a3658a cmake-3.27.5-macos-universal.dmg -55648dbcec864ab020fbca29fa487439528c8f7161e47c2ad3c29b54dfb7e5eb cmake-3.27.5-macos-universal.tar.gz -b53c251b690ec6e72fde2d3ef433924df8be13481cd85505325032556b0868b1 cmake-3.27.5-macos10.10-universal.dmg -1f776640e6ad35b2b3fe2ab5e39cff363b2c3034ecb56e45597402b7bf010e47 cmake-3.27.5-macos10.10-universal.tar.gz -39f9e45907fadb707cc723f6235c609fe317fcdb255da2f3642dead0abe19361 cmake-3.27.5-windows-arm64.msi -3fcc84d34e3213b0e4261295eaddfc645685ab366dc570421555e7f3d3080d3a cmake-3.27.5-windows-arm64.zip -591d9edf38aec363ffef8b5f48746fbd843f1d781091433343089620e8a4ad20 cmake-3.27.5-windows-i386.msi -cd1225354a5639a992d772f2043a1f0ebadb7ed2d77e0f859e555157410555ce cmake-3.27.5-windows-i386.zip -359db89170adee2413357d23048157f44ceb9aca10777e94b73ed89abab76d67 cmake-3.27.5-windows-x86_64.msi -1e8e06c8ecf63d5f213019e1cd39ea41a6cf952db5f2c8e69b8e47f5bc302684 cmake-3.27.5-windows-x86_64.zip -5175e8fe1ca9b1dd09090130db7201968bcce1595971ff9e9998c2f0765004c9 cmake-3.27.5.tar.gz -3084660c00eec05f7cdc2b6b0e06324692eef57a5e05ab7789d1cefc18de010e cmake-3.27.5.zip diff --git a/cmake-3.27.5-SHA-256.txt.asc b/cmake-3.27.5-SHA-256.txt.asc deleted file mode 100644 index 3f44c02..0000000 --- a/cmake-3.27.5-SHA-256.txt.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEExsJlMku+vcNQtRPQLSzvEDSSFoQFAmUDR+8ACgkQLSzvEDSS -FoQweA/8D3TI5N1RsTlBbxc8lHm4yG48S/TupI187RRc4hPi2uSq1iWmcRr9deuW -pKVBhpzENni8FUAtk4JULxNJlirU/StkBGifjnzd77pju2ezlZbKj1ScNX35EWn6 -HkLKQb91z8Q/mxVDthT+zB9E3HSbR3OLwmb29ZVBXRDfvR428XIf4CfGIWJeNNMI -2i6GXX3zFw8CKoEoOKBDa3PAPo0qYVFLeYxFTellSXCHPcaYCNVu3WikIrqCf1NW -2sbP9S2hxFj+bUAVMlumbIhrQJo6ZvuwqQlYUBxxikMC4iA+BB+wpm7bk3zGLG8A -68tcQkmlcFDlLHv2a2VB2fgLxmFKs/As9QBMZOTTC7ZpE3c3DmttlMc3O6twxxXP -e/Ne+FX8Pl/uutZkSZ/bBwTfm76ZAj+7z8j4bt0mZ7hPh2a99pon4cMmeaY7Tfkl -ilcApkTL1m0sIMH/trdSiEnJJ9onz6N5vE8ukqUmxWga20o2obOkXtS3Q+nmA90J -IqAzai8ack5gHqM4Xo9jNZvi//qBz07m34kNExQTMyeQ0DqdIUPv8bqcDai+7Lrs -m7N1sTAkB2axfhrvEWlzuJNmP0NGMmTH8z6GOXMimbI7bMqF/99igoTpKFumLTzF -Mxpxy409iOjDevdm6XcHM6neJE5cxQyZXRddH95lSYNUMKZZLd8= -=1fU5 ------END PGP SIGNATURE----- diff --git a/cmake-3.27.5.tar.gz b/cmake-3.27.5.tar.gz deleted file mode 100644 index 4a5adc1..0000000 --- a/cmake-3.27.5.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5175e8fe1ca9b1dd09090130db7201968bcce1595971ff9e9998c2f0765004c9 -size 10981172 diff --git a/cmake-3.27.7-SHA-256.txt b/cmake-3.27.7-SHA-256.txt new file mode 100644 index 0000000..f8fdc8b --- /dev/null +++ b/cmake-3.27.7-SHA-256.txt @@ -0,0 +1,17 @@ +355170d928c08e652a486324232c201232681d330bddf90edf7982c7dac8589d cmake-3.27.7-files-v1.json +cc4f7fe837a88d0919ec366d224a67d0b238a88b9bf3c58d7fa6180c60d57703 cmake-3.27.7-linux-aarch64.sh +f40ec1b7d41e94efd6c79cf0b7fc45ed6068543af0fea47b0c9fbf2b1b1b3fbc cmake-3.27.7-linux-aarch64.tar.gz +ef8ea3113568500ad2cff853b21824fedb6becaef4300cd7b00d7231b7d31940 cmake-3.27.7-linux-x86_64.sh +a8c92ecb139bcc7a1f92a8108179bd1d021bdb158a5ee759cba6d60010b83ae9 cmake-3.27.7-linux-x86_64.tar.gz +2a41726785826b43644a3857010c6684382ba7d914125e6516a5cf6f565ea09c cmake-3.27.7-macos-universal.dmg +54fd2f14b3d4fc2e8363e775c5eaceb52b532667bc79f98413959cfbb0978819 cmake-3.27.7-macos-universal.tar.gz +2f64d5a422e367afefc3962abdbb7ca51bb78d49b17b0d18e34374f473b434f9 cmake-3.27.7-macos10.10-universal.dmg +4a366d07fbe0be7e1efcf0dbd743d09a5dc6609da79035e4036b12296ec679cf cmake-3.27.7-macos10.10-universal.tar.gz +1fe253a3cb58a82bfc0fa837cf7748a857da38caa9afc0ef04be93142e54a0af cmake-3.27.7-windows-arm64.msi +d9b19fd6830510022156621042759af2374111dc4f431b58c8828a17a68633dc cmake-3.27.7-windows-arm64.zip +adcce264ca97cfa15fdf3894b5c7dff6df745b43f3596bcffa50534c21c444a1 cmake-3.27.7-windows-i386.msi +e202611cda835c25523ae512c125fc897dfbc388f5d35e7ab62a94096f34ca9c cmake-3.27.7-windows-i386.zip +40d06412e7dc73007fedb2df5955c1379e87398febd1d1b69aaca7e80fcad366 cmake-3.27.7-windows-x86_64.msi +5588e50030cda3e6fa96724444d8539916ac808d78d608cda6ae6ff7c4c4c9c8 cmake-3.27.7-windows-x86_64.zip +08f71a106036bf051f692760ef9558c0577c42ac39e96ba097e7662bd4158d8e cmake-3.27.7.tar.gz +36c4e702b625a9781ee24ecdad5a3a87fb69c7774b82b5729cd0912fbe541166 cmake-3.27.7.zip diff --git a/cmake-3.27.7-SHA-256.txt.asc b/cmake-3.27.7-SHA-256.txt.asc new file mode 100644 index 0000000..dc977cc --- /dev/null +++ b/cmake-3.27.7-SHA-256.txt.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEExsJlMku+vcNQtRPQLSzvEDSSFoQFAmUgDl8ACgkQLSzvEDSS +FoRoZhAAmCnOc0mOK+FjKFnrSW5kkjaJrSsvHVXJ93yKoexVTeYQx6CMYKrJZ++u +4ePFUWqJUIliaYXxxkeI2we9WSRmVABAFxbBXNq9p6EtuujUBr+mhbqiAI3sOaii +Pjb8CZhrwHYfxCKlbT3lOaS9WfqH/rdIAhRfJwTD1YVDY8+oq4BxaaN048cLNtE0 +8Kr6M2AWMUpaEpRkEcbgghsOkNWtJXAfPhnubnbIMaURH5vOdnPnITvTtK8q5h8+ +ihws6DKQOOOwXogoc3UiRTrENeaJ/QyOpf7uetY2p8oJ8cOQKyDJX8tchuU7lm+u +QeH6U8bDLP0zp4mp0NNddkryIKDJ9gLFxMX/TrJ809Evu/po3FyS+mysaNf5/e6c +ME9f6d0Vwp4Nl35KKQz3s89p0ia8FCh3rcaD0feU3w+GS+WHm9xtX5OP3dkxl/a1 +stmKDqoaOKt1prrWVoUeBziw0icqwspiwQHmEcKaQL2uSiTgyh4Q49zOCHIae5Mt +3Kshy/MgKRT2gMZc5gTa4Fv4pzndnOoirHbyWrg43gksfZZ8SXl0KE1UdTxghwBZ +TnbRS5IFCJhLJKHCsP6vtzrRTso7BcCIyB6sZWsLartCidfoWefVqYAAT5SBhHBJ +FZVCbwETJDPIA+qcK+XXhn0kMtkw6BlSZU0rOLSS58bmpPpqAuE= +=8xI+ +-----END PGP SIGNATURE----- diff --git a/cmake-3.27.7.tar.gz b/cmake-3.27.7.tar.gz new file mode 100644 index 0000000..54bb913 --- /dev/null +++ b/cmake-3.27.7.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:08f71a106036bf051f692760ef9558c0577c42ac39e96ba097e7662bd4158d8e +size 10982558 diff --git a/cmake.changes b/cmake.changes index 8b35cd3..fb97e2c 100644 --- a/cmake.changes +++ b/cmake.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Fri Oct 13 08:06:23 UTC 2023 - Paolo Stivanin + +- update to 3.27.7: + * Tests: Clarify RunCMake.CTestTimeout case name + * ctest: Restore support for --timeout values higher than default test timeout + * Help: Document CMP0124 behavior on already-set variables + * FindPostgreSQL: Add support for version 16 + ------------------------------------------------------------------- Fri Sep 15 05:49:45 UTC 2023 - Paolo Stivanin diff --git a/cmake.spec b/cmake.spec index 0de7213..8163f34 100644 --- a/cmake.spec +++ b/cmake.spec @@ -46,7 +46,7 @@ %endif %define shortversion 3.27 Name: cmake%{?psuffix} -Version: 3.27.5 +Version: 3.27.7 Release: 0 Summary: Cross-platform make system License: BSD-3-Clause diff --git a/feature-suse-python-interp-search-order.patch b/feature-suse-python-interp-search-order.patch index 8d67d04..9981ade 100644 --- a/feature-suse-python-interp-search-order.patch +++ b/feature-suse-python-interp-search-order.patch @@ -1,8 +1,8 @@ -Index: cmake-3.26.2/Modules/FindPythonInterp.cmake +Index: cmake-3.27.7/Modules/FindPythonInterp.cmake =================================================================== ---- cmake-3.26.2.orig/Modules/FindPythonInterp.cmake -+++ cmake-3.26.2/Modules/FindPythonInterp.cmake -@@ -92,8 +92,9 @@ if(DEFINED PYTHONLIBS_VERSION_STRING) +--- cmake-3.27.7.orig/Modules/FindPythonInterp.cmake ++++ cmake-3.27.7/Modules/FindPythonInterp.cmake +@@ -105,8 +105,9 @@ if(DEFINED PYTHONLIBS_VERSION_STRING) list(GET _PYTHONLIBS_VERSION 1 _PYTHONLIBS_VERSION_MINOR) list(APPEND _Python_VERSIONS ${_PYTHONLIBS_VERSION_MAJOR}.${_PYTHONLIBS_VERSION_MINOR}) endif() From 92274bd9cc016cf236f3ba6ba1170aa722a6e066bbc499a8930fb91b0be9bd7b Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Thu, 26 Oct 2023 06:40:59 +0000 Subject: [PATCH 5/6] Accepting request 1119169 from home:jengelh:branches:devel:tools:building - Stick -DNDEBUG back into CMAKE_C_FLAGS. Can't find a spontaneous resolution for projects relying on its presence. OBS-URL: https://build.opensuse.org/request/show/1119169 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=551 --- cmake.changes | 6 ++++++ cmake.macros | 17 +++++++++++------ 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/cmake.changes b/cmake.changes index fb97e2c..2845b14 100644 --- a/cmake.changes +++ b/cmake.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Oct 20 07:25:25 UTC 2023 - Jan Engelhardt + +- Stick -DNDEBUG back into CMAKE_C_FLAGS. Can't find a spontaneous + resolution for projects relying on its presence. + ------------------------------------------------------------------- Fri Oct 13 08:06:23 UTC 2023 - Paolo Stivanin diff --git a/cmake.macros b/cmake.macros index 3fb5f11..1fb9674 100644 --- a/cmake.macros +++ b/cmake.macros @@ -10,6 +10,11 @@ %__cmake_make_prefix_relative() %{lua:print((string.gsub((rpm.expand("%1")), ((rpm.expand("%{_prefix}")) .. "/"), "", 1)))} %__cmake_make_root_relative() %{lua:print((string.gsub((rpm.expand("%1")), "/", "", 1)))} +# +# Some cmake-using software has an unfortunate reliance on -DNDEBUG being +# present (when cmake is used without explicitly selecting a build type or +# cflags). Cf. https://bugzilla.redhat.com/show_bug.cgi?id=1692426 +# %cmake \ find %__sourcedir -type f -name CMakeLists.txt \\\ -exec sed -i -re '/^[[:blank:]]*[sS][eE][tT][[:blank:]]*\\\([[:blank:]]*(CMAKE_BUILD_TYPE|CMAKE_COLOR_MAKEFILE|CMAKE_INSTALL_PREFIX|CMAKE_VERBOSE_MAKEFILE).*\\\)/{s/^/#IGNORE /}' {} + \ @@ -37,12 +42,12 @@ -DSYSCONF_INSTALL_DIR:PATH=%{_sysconfdir} \\\ -DSHARE_INSTALL_PREFIX:PATH=%{_datadir} \\\ -DCMAKE_BUILD_TYPE=RelWithDebInfo \\\ - -DCMAKE_C_FLAGS="${CFLAGS:-%optflags}" \\\ - -DCMAKE_C_FLAGS_RELWITHDEBINFO="${CFLAGS:-%optflags}" \\\ - -DCMAKE_CXX_FLAGS="${CXXFLAGS:-%optflags}" \\\ - -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="${CXXFLAGS:-%optflags}" \\\ - -DCMAKE_Fortran_FLAGS="${FFLAGS:-%optflags%{?_fmoddir: -I%_fmoddir}}" \\\ - -DCMAKE_Fortran_FLAGS_RELWITHDEBINFO="${FFLAGS:-%optflags%{?_fmoddir: -I%_fmoddir}}" \\\ + -DCMAKE_C_FLAGS="-DNDEBUG ${CFLAGS:-%optflags}" \\\ + -DCMAKE_C_FLAGS_RELWITHDEBINFO="-DNDEBUG ${CFLAGS:-%optflags}" \\\ + -DCMAKE_CXX_FLAGS="${CXXFLAGS:--DNDEBUG %optflags}" \\\ + -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="${CXXFLAGS:--DNDEBUG %optflags}" \\\ + -DCMAKE_Fortran_FLAGS="${FFLAGS:--DNDEBUG %optflags%{?_fmoddir: -I%_fmoddir}}" \\\ + -DCMAKE_Fortran_FLAGS_RELWITHDEBINFO="${FFLAGS:--DNDEBUG %optflags%{?_fmoddir: -I%_fmoddir}}" \\\ -DCMAKE_EXE_LINKER_FLAGS="%{?build_ldflags} -Wl,--as-needed -Wl,-z,now" \\\ -DCMAKE_MODULE_LINKER_FLAGS="%{?build_ldflags} -Wl,--as-needed" \\\ -DCMAKE_SHARED_LINKER_FLAGS="%{?build_ldflags} -Wl,--as-needed -Wl,-z,now" \\\ From 674068c525ca5ddacbad043ec0382ef7df466ba5fc96deb80b6c7e06d8677f85 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Sat, 11 Nov 2023 16:07:56 +0000 Subject: [PATCH 6/6] Accepting request 1124704 from home:dimstar:Factory Revert that cmake macro stuff that has been causing grieph since August Once a proper solution is found, things like this can be re-attempted, but for now we need a solution to move forward with newer cmake versions for zlib 1.3 compatibility OBS-URL: https://build.opensuse.org/request/show/1124704 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=552 --- cmake.changes | 12 ------------ cmake.macros | 14 +++----------- 2 files changed, 3 insertions(+), 23 deletions(-) diff --git a/cmake.changes b/cmake.changes index 2845b14..356805e 100644 --- a/cmake.changes +++ b/cmake.changes @@ -1,9 +1,3 @@ -------------------------------------------------------------------- -Fri Oct 20 07:25:25 UTC 2023 - Jan Engelhardt - -- Stick -DNDEBUG back into CMAKE_C_FLAGS. Can't find a spontaneous - resolution for projects relying on its presence. - ------------------------------------------------------------------- Fri Oct 13 08:06:23 UTC 2023 - Paolo Stivanin @@ -35,12 +29,6 @@ Wed Aug 23 20:04:25 UTC 2023 - Andreas Stieger * Graphviz: Restore support for per-target dependency graph options * FindOpenSSL: Fix OpenSSL 3.0.0 version extraction -------------------------------------------------------------------- -Wed Aug 16 17:44:46 UTC 2023 - Jan Engelhardt - -- Make %cmake_build insert RELWITHDEBINFO CFLAGS as well to avoid - projects overriding our %optflags with some cmake default. - ------------------------------------------------------------------- Sat Aug 12 12:38:42 UTC 2023 - Christoph G diff --git a/cmake.macros b/cmake.macros index 1fb9674..10cd1f7 100644 --- a/cmake.macros +++ b/cmake.macros @@ -10,11 +10,6 @@ %__cmake_make_prefix_relative() %{lua:print((string.gsub((rpm.expand("%1")), ((rpm.expand("%{_prefix}")) .. "/"), "", 1)))} %__cmake_make_root_relative() %{lua:print((string.gsub((rpm.expand("%1")), "/", "", 1)))} -# -# Some cmake-using software has an unfortunate reliance on -DNDEBUG being -# present (when cmake is used without explicitly selecting a build type or -# cflags). Cf. https://bugzilla.redhat.com/show_bug.cgi?id=1692426 -# %cmake \ find %__sourcedir -type f -name CMakeLists.txt \\\ -exec sed -i -re '/^[[:blank:]]*[sS][eE][tT][[:blank:]]*\\\([[:blank:]]*(CMAKE_BUILD_TYPE|CMAKE_COLOR_MAKEFILE|CMAKE_INSTALL_PREFIX|CMAKE_VERBOSE_MAKEFILE).*\\\)/{s/^/#IGNORE /}' {} + \ @@ -42,12 +37,9 @@ -DSYSCONF_INSTALL_DIR:PATH=%{_sysconfdir} \\\ -DSHARE_INSTALL_PREFIX:PATH=%{_datadir} \\\ -DCMAKE_BUILD_TYPE=RelWithDebInfo \\\ - -DCMAKE_C_FLAGS="-DNDEBUG ${CFLAGS:-%optflags}" \\\ - -DCMAKE_C_FLAGS_RELWITHDEBINFO="-DNDEBUG ${CFLAGS:-%optflags}" \\\ - -DCMAKE_CXX_FLAGS="${CXXFLAGS:--DNDEBUG %optflags}" \\\ - -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="${CXXFLAGS:--DNDEBUG %optflags}" \\\ - -DCMAKE_Fortran_FLAGS="${FFLAGS:--DNDEBUG %optflags%{?_fmoddir: -I%_fmoddir}}" \\\ - -DCMAKE_Fortran_FLAGS_RELWITHDEBINFO="${FFLAGS:--DNDEBUG %optflags%{?_fmoddir: -I%_fmoddir}}" \\\ + -DCMAKE_C_FLAGS="${CFLAGS:-%optflags}" \\\ + -DCMAKE_CXX_FLAGS="${CXXFLAGS:-%optflags}" \\\ + -DCMAKE_Fortran_FLAGS="${FFLAGS:-%optflags%{?_fmoddir: -I%_fmoddir}}" \\\ -DCMAKE_EXE_LINKER_FLAGS="%{?build_ldflags} -Wl,--as-needed -Wl,-z,now" \\\ -DCMAKE_MODULE_LINKER_FLAGS="%{?build_ldflags} -Wl,--as-needed" \\\ -DCMAKE_SHARED_LINKER_FLAGS="%{?build_ldflags} -Wl,--as-needed -Wl,-z,now" \\\