SHA256
3
0
forked from pool/cmake

Accepting request 928364 from home:AndreasStieger:branches:devel:tools:building

cmake 3.21.4

OBS-URL: https://build.opensuse.org/request/show/928364
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=475
This commit is contained in:
Simon Lees 2021-10-31 22:28:54 +00:00 committed by Git OBS Bridge
parent b9fb0278b0
commit 3d639c9d2f
9 changed files with 43 additions and 87 deletions

View File

@ -1,15 +0,0 @@
77b49dd5598c84296bd008e8a91b086e89dd484702c68ec67e3c68cba2b22968 cmake-3.21.3-files-v1.json
fb2164ae60957d31852607c22e3a31a65d8b6bc8dd627f54ad5beb83cbab47d3 cmake-3.21.3-linux-aarch64.sh
273d0d4d4189b3b9a073d8d469f6c52e9ebb539bb727c9e49fc53a51269794c4 cmake-3.21.3-linux-aarch64.tar.gz
7b7052b09afb059dd64673ee4fedff0e7f6067e9f4adb76e23f09e6e9a304931 cmake-3.21.3-linux-x86_64.sh
a19aa9fcf368e9d923cdb29189528f0fe00a0d08e752ba4e547af91817518696 cmake-3.21.3-linux-x86_64.tar.gz
918eeed1dd375525d6cbd74f029eeeb733936792b19319cc367e66d4a1b5ec91 cmake-3.21.3-macos-universal.dmg
a86c6d4ffb829e46cf4ea6c14558917b0a15eb42019c5c6b55a25e2610e8c8da cmake-3.21.3-macos-universal.tar.gz
7c11692be418526c5f442888b87fda35afc326cf7fb53fc0c1a4a9f85b61a722 cmake-3.21.3-macos10.10-universal.dmg
099c45c424c4feb0136c3eb8159e88cb9e0c633035cbf05f618886739be26664 cmake-3.21.3-macos10.10-universal.tar.gz
41b7fd02e5e7dcad69dc83b5a9bcf1275addf2003bc58c9e8f3698fd6cf0d167 cmake-3.21.3-windows-i386.msi
b38d83a7670af97d4b8bca2a70f25f8e4cb2d912eb7c371ad3d4a263c2c841d2 cmake-3.21.3-windows-i386.zip
548ee0a0eee2b1b4ded36eb935362d24bf7537dce6f93f42c4d34c6f83eed6de cmake-3.21.3-windows-x86_64.msi
e28178103fad901a99fb201fac04e4787d4cd4f664c5db88998c57eed68843b9 cmake-3.21.3-windows-x86_64.zip
d14d06df4265134ee42c4d50f5a60cb8b471b7b6a47da8e5d914d49dd783794f cmake-3.21.3.tar.gz
629485ec37c172b55bcfa913b3c57387230273f649ff8a425deebf64d9539e9a cmake-3.21.3.zip

View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEExsJlMku+vcNQtRPQLSzvEDSSFoQFAmFIxXQACgkQLSzvEDSS
FoTQ5w//Xu/T6UVkBIbfKDV2RFGoSoQocGdrXpVaYUA1usIbyjFBaUS92I2Sw3cJ
03jx6m4t2WEFVe5tyZ8nfkTDiy1Z0wqk4wAZkBVAOSTev82bSc2Dfsjvv2EYi1my
4AdFgYoZTybLsgL8lY2ytLJSRru+qLJoIvXBL7NrLrzMlmrF6aPv94TydrCVMllW
+ptdp9XD4ELKogE/arrFEsLS2vlzShOhEmUx0d1T3sOsyRJjrk7gJhihzHMUJXQ2
v0GMi7No4FeL3eELRRWyJpzzyEpBKh/+5QyJmyLnCqEY0tCiGFVHY7gTVNEA3Bc7
kckeWaKNnIn3IuiGMvgukV+fXJ+4a51cieKVMOtbMN9qN+dCxvgtPtOW7ZuKJrVo
3uujKwcPUCu+E0dJ9j5YKXZCQaJuBn5XG9eLnfGl6mrA70szOIVfYGESMZDQ74XN
4hbgq1l2V4kfXNXH9MXhabPW87y/3wmaHB76D8WR5lx7WYwbZ5I2m91M4tGZ/nx0
yy5HzK9+YAnD6qmc/rcmHYi5b+VdKSRQ4hWCL/i/JIazl9agmdrbIf0tWy4s+lrN
CNUr5Fj6SgQ1Pw9KOYM/vaipvvrtiMuy4yYr9wxSN71F+UlffNUJpje8EdblXbjC
zCMzIoB2H6n3gs1A8EazR9EmOGP4izgfCW5ih9FUMNOSA9sGX0I=
=4f59
-----END PGP SIGNATURE-----

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d14d06df4265134ee42c4d50f5a60cb8b471b7b6a47da8e5d914d49dd783794f
size 9630442

15
cmake-3.21.4-SHA-256.txt Normal file
View File

@ -0,0 +1,15 @@
de3841c8da3869e8ed6ec466afbfb1faedefec756d9fb94bc95ddcbcc6e15860 cmake-3.21.4-files-v1.json
8bd4e245878232ea8ec3f73be06c80305e8b362ba677a4bc5086311f391496eb cmake-3.21.4-linux-aarch64.sh
abe24e2e6ae8a706e771a612603ec93457dc6b71bdb09e35d2a26f051e2fa818 cmake-3.21.4-linux-aarch64.tar.gz
63cb3406f5320edc94504212fe75e8625751ec21e8d5dab76d8ed67ed780066e cmake-3.21.4-linux-x86_64.sh
eddba9da5b60e0b5ec5cbb1a65e504d776e247573204df14f6d004da9bc611f9 cmake-3.21.4-linux-x86_64.tar.gz
209e8c3048b6855d78dab1e1691309f377ba859a757e5f7b508fd7a3ff0afafa cmake-3.21.4-macos-universal.dmg
f818a10fe625b215e31d0c29c19a6563fb5f51ed7cc7727e5011626c11ea321a cmake-3.21.4-macos-universal.tar.gz
eee8769a9db81d137b9d30debb751700f646c51f02ca16b05843a5f777f653f5 cmake-3.21.4-macos10.10-universal.dmg
2fe979147896cde7aa8a28ee9f58652487928f4ed50e3b1e48b57bd08fa480fe cmake-3.21.4-macos10.10-universal.tar.gz
c769ece7ec8e91529f4cc938f088b4699a1f5cd39b7f44158d1aa0ab6e76ab74 cmake-3.21.4-windows-i386.msi
970d38453abd7c5953415b8ea8c1f66f88a2bd2548feabc5e4b6f1b8c4acdcae cmake-3.21.4-windows-i386.zip
13a18f293a09f65658913003ee719b29fd7e82937dbf61bf1f96ed5d139c8c6d cmake-3.21.4-windows-x86_64.msi
360ee9bf77cd891d4a33997e4e214d0cd6a0fd7ae6051d023f403a74248914a8 cmake-3.21.4-windows-x86_64.zip
d9570a95c215f4c9886dd0f0564ca4ef8d18c30750f157238ea12669c2985978 cmake-3.21.4.tar.gz
a57f6f08de47229fe51fd5ef4a20001eed4294923768f58aa21424a478076988 cmake-3.21.4.zip

View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEExsJlMku+vcNQtRPQLSzvEDSSFoQFAmF5ZOwACgkQLSzvEDSS
FoQ2FQ/+LLFVHIOPQqbxLGBCZ5BsFBag6kONmxYGWhQVQglN7VXtvBBDFBs91qV8
YucSvSdgiqKrbQAJcE9UQPmFcGYlvqlh56BcgO1RuWIYSH/ldJNcq2JDguaMKi9k
tbatVPKwIYxy6X/QMh+mglqpJrebyHZYn2hdY7aFm/xsvYcw7a6ezcD+c83/tuvR
DK72oIejzMtFGHnX1DkrZ9tMG7noFpV5Q6PbdoB/UpE32WRt6VoPwXiva93iQD6S
v9P9HU6Xkyly52RkWoFC2qqnFFLCtK/zXg4w6LyRC7urxIzPH5zmZM7t1C7vtXO+
40Ed1Ot/Qlw0twoMNMuiRAoXgKHx8yG8tnOnXc1SURzBJ5gK8Do0XJw9DO/vagON
7G0LgnuNBvQ89B+hxt4RoKuTdRduA142ESbs6Qb6FXgA3h07Ad5zkhLRl73hBGMc
/NBx2FkXr1BapbV3uCJxmac1yPcEYpSTHc1d1M9YYiPvINDRO78aXV26StYyJSiK
Fsi49q6+dXbg+8hgILtc8HgVZ00vuahXUywoc2YKWC1UXc83I8rfBaeS6hoMh3UA
0h6wkIEe37ud8t1NTfFGanD5BRISl2z/ucanq66putWt46Fdh0fSabK7RSoq67Xb
bzC+3AzM+3X3VmtS2r1kou8YkZ+xcwqRmTYSaIgjhcGJGZI/www=
=ie1d
-----END PGP SIGNATURE-----

3
cmake-3.21.4.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d9570a95c215f4c9886dd0f0564ca4ef8d18c30750f157238ea12669c2985978
size 9630991

View File

@ -1,50 +0,0 @@
From 28d0120b5ac62b56cd858bd46480c73730d044b4 Mon Sep 17 00:00:00 2001
From: "Bernhard M. Wiedemann" <bwiedemann@suse.de>
Date: Tue, 11 May 2021 17:46:55 +0200
Subject: [PATCH] Avoid SIGBUS on armv6
When running armv6 userspace on armv8 hardware with a 64 bit Linux kernel,
the mode 2 caused SIGBUS (unaligned memory access).
Running all our arm builds in the build farm
only on armv8 simplifies administration a lot.
Depending on compiler and environment, this change might slow down
memory accesses (did not benchmark it). The original analysis is 6 years old.
Fixes #2632
[Guillaume: Add Utilities/cmzstd/ prefix to apply in cmake
---
/Utilities/cmzstd/lib/common/mem.h | 4 +---
Utilities/cmzstd/lib/common/xxhash.c | 4 +---
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/Utilities/cmzstd/lib/common/mem.h b/Utilities/cmzstd/lib/common/mem.h
index dc6667c68b..9f3b81ab9d 100644
--- a/Utilities/cmzstd/lib/common/mem.h
+++ b/Utilities/cmzstd/lib/common/mem.h
@@ -143,9 +143,7 @@ MEM_STATIC size_t MEM_swapST(size_t in);
* Prefer these methods in priority order (0 > 1 > 2)
*/
#ifndef MEM_FORCE_MEMORY_ACCESS /* can be defined externally, on command line for example */
-# if defined(__GNUC__) && ( defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6J__) || defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_6Z__) || defined(__ARM_ARCH_6ZK__) || defined(__ARM_ARCH_6T2__) )
-# define MEM_FORCE_MEMORY_ACCESS 2
-# elif defined(__INTEL_COMPILER) || defined(__GNUC__) || defined(__ICCARM__)
+# if defined(__INTEL_COMPILER) || defined(__GNUC__) || defined(__ICCARM__)
# define MEM_FORCE_MEMORY_ACCESS 1
# endif
#endif
diff --git a/Utilities/cmzstd/lib/common/xxhash.c b/Utilities/cmzstd/lib/common/xxhash.c
index 0ddbf13a39..926b33604e 100644
--- a/Utilities/cmzstd/lib/common/xxhash.c
+++ b/Utilities/cmzstd/lib/common/xxhash.c
@@ -30,9 +30,7 @@
* Prefer these methods in priority order (0 > 1 > 2)
*/
#ifndef XXH_FORCE_MEMORY_ACCESS /* can be defined externally, on command line for example */
-# if defined(__GNUC__) && ( defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6J__) || defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_6Z__) || defined(__ARM_ARCH_6ZK__) || defined(__ARM_ARCH_6T2__) )
-# define XXH_FORCE_MEMORY_ACCESS 2
-# elif (defined(__INTEL_COMPILER) && !defined(WIN32)) || \
+# if (defined(__INTEL_COMPILER) && !defined(WIN32)) || \
(defined(__GNUC__) && ( defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__) || defined(__ARM_ARCH_7R__) || defined(__ARM_ARCH_7M__) || defined(__ARM_ARCH_7S__) )) || \
defined(__ICCARM__)
# define XXH_FORCE_MEMORY_ACCESS 1

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Sun Oct 31 11:07:05 UTC 2021 - Andreas Stieger <andreas.stieger@gmx.de>
- cmake 3.21.4:
* The Visual Studio 17 2022 generator is not based on the
"Visual Studio 2022" release candidates.
- drop cmake-fix-zstd-armv6.patch, upstream
-------------------------------------------------------------------
Wed Oct 13 12:34:11 UTC 2021 - Guillaume GARDET <guillaume.gardet@opensuse.org>

View File

@ -37,7 +37,7 @@
%endif
%define shortversion 3.21
Name: cmake%{?psuffix}
Version: 3.21.3
Version: 3.21.4
Release: 0
Summary: Cross-platform make system
License: BSD-3-Clause
@ -55,8 +55,6 @@ Patch0: cmake-fix-ruby-test.patch
# Search for python interpreters from newest to oldest rather then picking up /usr/bin/python as first choice
Patch1: feature-suse-python-interp-search-order.patch
Patch2: cmake-fix-png-include-dir.patch
# PATCH-FIX-UPSTREAM - https://gitlab.kitware.com/cmake/cmake/-/issues/22754
Patch3: cmake-fix-zstd-armv6.patch
BuildRequires: fdupes
BuildRequires: gcc-c++
BuildRequires: pkgconfig