From e1450897b2a78ba3c570862b1a469211c46bce66fdd025533d016d7bf90d9e1e Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Sat, 4 Jun 2022 08:14:02 +0000 Subject: [PATCH 1/2] Accepting request 979615 from home:jengelh:branches:devel:tools:building - Edit cmake.macros: Stop injecting -DNDEBUG at the end of CFLAGS. It's impossible to override by re-setting CFLAGS, and if it were really wanted globally, it should be in %optflags instead. OBS-URL: https://build.opensuse.org/request/show/979615 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=491 --- cmake.changes | 8 ++++++++ cmake.macros | 6 +++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/cmake.changes b/cmake.changes index 5fbe51f..8732b59 100644 --- a/cmake.changes +++ b/cmake.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sat May 28 18:54:48 UTC 2022 - Jan Engelhardt + +- Edit cmake.macros: Stop injecting -DNDEBUG at the end of + CFLAGS. It's impossible to override by re-setting CFLAGS, and + if it were really wanted globally, it should be in %optflags + instead. + ------------------------------------------------------------------- Wed Apr 13 20:48:21 UTC 2022 - Dirk Müller diff --git a/cmake.macros b/cmake.macros index df5f638..42ef8f5 100644 --- a/cmake.macros +++ b/cmake.macros @@ -26,9 +26,9 @@ -DCMAKE_INSTALL_LIBDIR:PATH=%{_lib} \\\ -DCMAKE_INSTALL_LIBEXECDIR=%{_libexecdir} \\\ -DCMAKE_BUILD_TYPE=RelWithDebInfo \\\ - -DCMAKE_C_FLAGS="${CFLAGS:-%optflags} -DNDEBUG" \\\ - -DCMAKE_CXX_FLAGS="${CXXFLAGS:-%optflags} -DNDEBUG" \\\ - -DCMAKE_Fortran_FLAGS="${FFLAGS:-%optflags%{?_fmoddir: -I%_fmoddir}} -DNDEBUG" \\\ + -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,--no-undefined -Wl,-z,now" \\\ -DCMAKE_MODULE_LINKER_FLAGS="%{?build_ldflags} -Wl,--as-needed" \\\ -DCMAKE_SHARED_LINKER_FLAGS="%{?build_ldflags} -Wl,--as-needed -Wl,--no-undefined -Wl,-z,now" \\\ From 4bad45639dfa3e804438a865690adbf965a2d3ff52cdf0d8e49373f808736ab9 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Sun, 5 Jun 2022 00:20:32 +0000 Subject: [PATCH 2/2] - update to 3.23.2: * The ``CPACK_PACKAGEMAKER_CHOICES`` variable used in the ``CPack.distribution.dist.in`` template file was replaced by a new ``CPACK_APPLE_PKG_INSTALLER_CONTENT`` variable in CMake 3.23.0. This broke projects that provided their own template file but still expected the ``CPACK_PACKAGEMAKER_CHOICES`` variable to be defined. The old ``CPACK_PACKAGEMAKER_CHOICES`` variable is now also set to the same content as it was before, but it is formally deprecated. OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=492 --- cmake-3.23.1-SHA-256.txt | 15 --------------- cmake-3.23.1-SHA-256.txt.asc | 16 ---------------- cmake-3.23.1.tar.gz | 3 --- cmake-3.23.2-SHA-256.txt | 15 +++++++++++++++ cmake-3.23.2-SHA-256.txt.asc | 16 ++++++++++++++++ cmake-3.23.2.tar.gz | 3 +++ cmake.changes | 12 ++++++++++++ cmake.spec | 2 +- 8 files changed, 47 insertions(+), 35 deletions(-) delete mode 100644 cmake-3.23.1-SHA-256.txt delete mode 100644 cmake-3.23.1-SHA-256.txt.asc delete mode 100644 cmake-3.23.1.tar.gz create mode 100644 cmake-3.23.2-SHA-256.txt create mode 100644 cmake-3.23.2-SHA-256.txt.asc create mode 100644 cmake-3.23.2.tar.gz diff --git a/cmake-3.23.1-SHA-256.txt b/cmake-3.23.1-SHA-256.txt deleted file mode 100644 index 0e720c2..0000000 --- a/cmake-3.23.1-SHA-256.txt +++ /dev/null @@ -1,15 +0,0 @@ -8a20df14ccfe1ece43456990c2d95013d988fe39bac931a461245ceccb8850e1 cmake-3.23.1-files-v1.json -86122bdfd030208aa36705ef421a218ccec52a14368020b2d67043af5e45490b cmake-3.23.1-linux-aarch64.sh -74062efddeb935bce3d33694a4db534cef9a650f77a9a153a9f217d9dc385c75 cmake-3.23.1-linux-aarch64.tar.gz -da2a9b18c3bfb136917fa1a579aa5316b01c1d6c111043d03f18877ff05bda30 cmake-3.23.1-linux-x86_64.sh -f3c654b2e226b9d43369e0bd8487c51618d4dbe5a1af929dd32af7e6ca432d60 cmake-3.23.1-linux-x86_64.tar.gz -f0db05b00be9a4a7107bced3263fd2a470dc0d04b52db0f49210b5a57239709e cmake-3.23.1-macos-universal.dmg -f794ed92ccb4e9b6619a77328f313497d7decf8fb7e047ba35a348b838e0e1e2 cmake-3.23.1-macos-universal.tar.gz -592fe439c6775f2183d7c21c3e6733cce5813e66b69ff603d4943ea99b1ee6f3 cmake-3.23.1-macos10.10-universal.dmg -32cafe6ba92135eef752f8c691fdbafcf1b38363384d0a926fd3e688140ff80d cmake-3.23.1-macos10.10-universal.tar.gz -5bb01d27dc665aac5ddbdb24eebfb2146601e150884b2b1540d39ceb61875f3f cmake-3.23.1-windows-i386.msi -db5860cbe101a1029676f62e158ed2f25390d52ddd47199ae53ea11fe0374908 cmake-3.23.1-windows-i386.zip -34a1af1470d7fdeb3b510aaafbcd4d6b6f10cec70ba0495d73545fed1986d230 cmake-3.23.1-windows-x86_64.msi -9b509cc4eb7191dc128cfa3f2170036f9cbc7d9d5f93ff7fafc5b2d77b3b40dc cmake-3.23.1-windows-x86_64.zip -33fd10a8ec687a4d0d5b42473f10459bb92b3ae7def2b745dc10b192760869f3 cmake-3.23.1.tar.gz -437f4cd288b08c36e521e4518a6c29bd5fab82d26d6706f92602f3f672b18c03 cmake-3.23.1.zip diff --git a/cmake-3.23.1-SHA-256.txt.asc b/cmake-3.23.1-SHA-256.txt.asc deleted file mode 100644 index d4eeac1..0000000 --- a/cmake-3.23.1-SHA-256.txt.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEExsJlMku+vcNQtRPQLSzvEDSSFoQFAmJVkdUACgkQLSzvEDSS -FoQNyRAAjY3z7eqeG6E1IbG23OxSW6oehC74HgZHalv8ct/5WqkGFH+x/Dhcsfp0 -TTFBYjmtEM/4CbYMo6k18LTIUAnQj15KTD9HEyv2Zv/x4zxC4eH9DulCiiDy3h9p -x1/J7x+ObzLO9dRlGq369W6OlQ0/B36yxn0hJ1ej9d4PeiW566eO9BLDuB0j6Pqa -4sp0xe2ZAFNXMIQNX4SkoyljgyhmHZD3bxYkJ15Edl2kPpOh9Ruguq+ktXgYnc7n -FMAXluxkOPaDyGGyqfVtuwI0U7wnmIwXlkvYJUPRFv4KXSEbSJc+En8xI+pbI5cd -+yRo4HqF3NFT5pRzD8qpGIdHqXS3LMmXltV8M1yyOClUTyzUlJIoREWxHWcOYPUd -zHP3bYNa8Zg7D4x9AmNGIz/02CzD8UiGpkPOSoBdm/7KtChs2ca92Kh3YVZAaG1u -4tj+vFBT5ZrYZ8m/H3SzEFLSHRinmb8ivEtnrz81z2llQGAdN3xoJ9A5R6S/cmXR -x+nsryaKFIp/0D45+MmKkpGGypAYvkCsJx1KBHHz8uDsMJSx9mx8I7eptGna7Rbw -HCPd7A5XAZvLyNOsuszeBPsJ86KkRu0SrtWx6JqYeBmtKHFus9B3oxfYJNGoLd2K -ex8tJHKln/X3j+Hmd+vbY5pAZ8N+jzKyuIxVmd5aEGkJdPWoBU4= -=4CaI ------END PGP SIGNATURE----- diff --git a/cmake-3.23.1.tar.gz b/cmake-3.23.1.tar.gz deleted file mode 100644 index d18861f..0000000 --- a/cmake-3.23.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:33fd10a8ec687a4d0d5b42473f10459bb92b3ae7def2b745dc10b192760869f3 -size 9982020 diff --git a/cmake-3.23.2-SHA-256.txt b/cmake-3.23.2-SHA-256.txt new file mode 100644 index 0000000..9af3e95 --- /dev/null +++ b/cmake-3.23.2-SHA-256.txt @@ -0,0 +1,15 @@ +8c1be6fbaf1647cec7a5fcd50c417f47f4ee6dc9c034f0b13439f3292d030e16 cmake-3.23.2-files-v1.json +864d26b8c81f0d779e665ccb121c2613475eadd2f7f45c7233818826f0ec2c89 cmake-3.23.2-linux-aarch64.sh +f2654bf780b53f170bbbec44d8ac67d401d24788e590faa53036a89476efa91e cmake-3.23.2-linux-aarch64.tar.gz +5cca63af386e5bd0bde67c87ffac915865abd7dcc48073528f58645abda8f695 cmake-3.23.2-linux-x86_64.sh +aaced6f745b86ce853661a595bdac6c5314a60f8181b6912a0a4920acfa32708 cmake-3.23.2-linux-x86_64.tar.gz +a333062264e659c6540a365d36438a7f113ea89b1a4cb52d31681a0ac56a5e82 cmake-3.23.2-macos-universal.dmg +853a0f9af148c5ef47282ffffee06c4c9f257be2635936755f39ca13c3286c88 cmake-3.23.2-macos-universal.tar.gz +78f8f8e09a98da62b5fc57af2ccccac5ad545e504fc199e8617f1d8f98cfb9d2 cmake-3.23.2-macos10.10-universal.dmg +c1194576b7eede70020dc7fd87eca7a836770e58c5591b1f2a81f0f5baf7856b cmake-3.23.2-macos10.10-universal.tar.gz +b575d5dcf6480e150ada98bdd01b70f7355af2a21ccd8a901a0221f89cde3c8f cmake-3.23.2-windows-i386.msi +6a4fcd6a2315b93cb23c93507efccacc30c449c2bf98f14d6032bb226c582e07 cmake-3.23.2-windows-i386.zip +df80df25b197431ef8ef6e46d6cc522e28b8790e13f19aea9f78aa3e22f00174 cmake-3.23.2-windows-x86_64.msi +2329387f3166b84c25091c86389fb891193967740c9bcf01e7f6d3306f7ffda0 cmake-3.23.2-windows-x86_64.zip +f316b40053466f9a416adf981efda41b160ca859e97f6a484b447ea299ff26aa cmake-3.23.2.tar.gz +d2a0434f8be9c7e8caa4646ce332cb7bf8fe5996022696ae68a1a63e767d85bd cmake-3.23.2.zip diff --git a/cmake-3.23.2-SHA-256.txt.asc b/cmake-3.23.2-SHA-256.txt.asc new file mode 100644 index 0000000..79641fd --- /dev/null +++ b/cmake-3.23.2-SHA-256.txt.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEExsJlMku+vcNQtRPQLSzvEDSSFoQFAmKOaLsACgkQLSzvEDSS +FoQUAg/9E8MgrGemgdm/RGPwwp+0T1crSqkziWXdEYibvpSw4zCe9tUNCHKh8rVS +KOXQeqe/8MFAuHWrltPNLJmSRp2Q3e2yC1nuXKrDg8kCCiP0JyQ0eHRtTmn2mh3a +8gCMZZn9xzwElqOycereH/M1pC54jjpLZbCxef+3lFNN5kH6NlUVIRKJQBrLDE30 +8Ch+ZkYImnGQ+a0Ytzwc2JM/r1ztefprqFMa63PtKtKjkjFs6X26L6qAlsw6Lseu +NRS/0Vmok1IzEB4OY6qNqVfSJ7u+lVl+JyNtnm0zV/f8Oj8X0aNQ4qhb42zzGZMD +F6IyyBmUiIsSeZ5KyjU+Rpk+1C9Lt2TkCrMnVK7JNNSTIzCremquDwnCIgfvYA0D +wqUyar24OF5IIYyQhjYdTMN/y005hBePbpFI4Wpgd+czxWASnMkl5zFea6hgyBbe +8PidD9E3AmNeoSgrC7YkW5CVXzukpOH1wDWk0cIbWnoZcuLXFXExDVHw85m6eCQt +JWaySvAi5BQbxaDdVVsPpHF7DyouxjNfu9oaH/8d87a2KNTttb5PGE8xi9C/q7/2 +2/HBdN2lw9Pzo/iR8IxXGChD4SHri2L/Xh18SsDESpGmLQjG5aK9mNrpM+/ZQ2N0 +HkxKS7lBG09A7FKMgTV5LNHE2OUVZf6JTpLflc6ES0Bw76/L6wo= +=YSGO +-----END PGP SIGNATURE----- diff --git a/cmake-3.23.2.tar.gz b/cmake-3.23.2.tar.gz new file mode 100644 index 0000000..8454c7c --- /dev/null +++ b/cmake-3.23.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f316b40053466f9a416adf981efda41b160ca859e97f6a484b447ea299ff26aa +size 9987716 diff --git a/cmake.changes b/cmake.changes index 8732b59..b3fc3b6 100644 --- a/cmake.changes +++ b/cmake.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Sun Jun 5 00:03:22 UTC 2022 - Dirk Müller + +- update to 3.23.2: + * The ``CPACK_PACKAGEMAKER_CHOICES`` variable used in the + ``CPack.distribution.dist.in`` template file was replaced by a new + ``CPACK_APPLE_PKG_INSTALLER_CONTENT`` variable in CMake 3.23.0. + This broke projects that provided their own template file but still + expected the ``CPACK_PACKAGEMAKER_CHOICES`` variable to be defined. + The old ``CPACK_PACKAGEMAKER_CHOICES`` variable is now also set to the + same content as it was before, but it is formally deprecated. + ------------------------------------------------------------------- Sat May 28 18:54:48 UTC 2022 - Jan Engelhardt diff --git a/cmake.spec b/cmake.spec index cc0e346..e1ba047 100644 --- a/cmake.spec +++ b/cmake.spec @@ -46,7 +46,7 @@ %endif %define shortversion 3.23 Name: cmake%{?psuffix} -Version: 3.23.1 +Version: 3.23.2 Release: 0 Summary: Cross-platform make system License: BSD-3-Clause