forked from pool/cmake
Accepting request 810386 from home:AndreasStieger:branches:devel:tools:building
cmake 3.17.3 bsc#1172267 OBS-URL: https://build.opensuse.org/request/show/810386 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=413
This commit is contained in:
Martin Pluskal
Git OBS Bridge
parent
4aea471671
commit
d741d85656
@ -1,40 +0,0 @@
|
||||
From 61d746e5922de50310558364f157b261f3e7917a Mon Sep 17 00:00:00 2001
|
||||
From: Vitezslav Cizek <vcizek@suse.com>
|
||||
Date: Wed, 27 May 2020 14:52:17 +0200
|
||||
Subject: [PATCH] FindOpenSSL: Detect OpenSSL 3.0.0
|
||||
|
||||
The OpenSSL versioning is changing with the upcoming 3.0.0 release.
|
||||
https://www.openssl.org/blog/blog/2018/11/28/version/
|
||||
Since 3.0.0, the patch letters are being dropped. The new format is:
|
||||
MAJOR.MINOR.PATCH
|
||||
|
||||
The OPENSSL_VERSION variable can now be directly derived from the new
|
||||
OPENSSL_VERSION_STR macro.
|
||||
https://www.openssl.org/docs/manmaster/man3/OPENSSL_VERSION_NUMBER.html
|
||||
---
|
||||
Modules/FindOpenSSL.cmake | 9 +++++++++
|
||||
1 file changed, 9 insertions(+)
|
||||
|
||||
diff --git a/Modules/FindOpenSSL.cmake b/Modules/FindOpenSSL.cmake
|
||||
index af713d6a84..45b641ddef 100644
|
||||
--- a/Modules/FindOpenSSL.cmake
|
||||
+++ b/Modules/FindOpenSSL.cmake
|
||||
@@ -415,6 +415,15 @@ if(OPENSSL_INCLUDE_DIR AND EXISTS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h")
|
||||
endif ()
|
||||
|
||||
set(OPENSSL_VERSION "${OPENSSL_VERSION_MAJOR}.${OPENSSL_VERSION_MINOR}.${OPENSSL_VERSION_FIX}${OPENSSL_VERSION_PATCH_STRING}")
|
||||
+ else ()
|
||||
+ # Since OpenSSL 3.0.0, the new version format is MAJOR.MINOR.PATCH and
|
||||
+ # a new OPENSSL_VERSION_STR macro contains exactly that
|
||||
+ file(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h" OPENSSL_VERSION_STR
|
||||
+ REGEX "^#[\t ]*define[\t ]+OPENSSL_VERSION_STR[\t ]+\"([0-9])+\.([0-9])+\.([0-9])+\".*")
|
||||
+ string(REGEX REPLACE "^.*OPENSSL_VERSION_STR[\t ]+\"([0-9]+\.[0-9]+\.[0-9]+)\".*$"
|
||||
+ "\\1" OPENSSL_VERSION_STR "${OPENSSL_VERSION_STR}")
|
||||
+
|
||||
+ set(OPENSSL_VERSION "${OPENSSL_VERSION_STR}")
|
||||
endif ()
|
||||
endif ()
|
||||
|
||||
--
|
||||
2.26.2
|
||||
|
||||
@ -1,10 +0,0 @@
|
||||
deb1735cb6a3a3b6fb498f5f2053dbfc333f36628a6d0ee6d16d3fdc6065145b cmake-3.17.2-Darwin-x86_64.dmg
|
||||
139500e20b080444fcafe57f24f57248c691c5187cce6695bee2b9aad6792c7d cmake-3.17.2-Darwin-x86_64.tar.gz
|
||||
f6c240f52e82cdc2000ba6ce517f176b3b6f0d948453a400ef92148bcd8a3040 cmake-3.17.2-Linux-x86_64.sh
|
||||
dc57f3cc448ca67fc8776b4ad4c22b087b9c6a8e459938b9622b8c7f4ef6b21e cmake-3.17.2-Linux-x86_64.tar.gz
|
||||
2cc188e46b2e98a557278700290d43550bc7a91b2d4d8928c991d938867db71b cmake-3.17.2-win32-x86.msi
|
||||
66a68a1032ad1853bcff01778ae190cd461d174d6a689e1c646e3e9886f01e0a cmake-3.17.2-win32-x86.zip
|
||||
06e999be9e50f9d33945aeae698b9b83678c3f98cedb3139a84e19636d2f6433 cmake-3.17.2-win64-x64.msi
|
||||
cf82b1eb20b6fbe583487656fcd496490ffccdfbcbba0f26e19f1c9c63b0b041 cmake-3.17.2-win64-x64.zip
|
||||
fc77324c4f820a09052a7785549b8035ff8d3461ded5bbd80d252ae7d1cd3aa5 cmake-3.17.2.tar.gz
|
||||
4b9e3a99573a3cbcd27d328a1b1ff9c7b35cf072dee78150d49844ff1ab6dbc1 cmake-3.17.2.zip
|
||||
@ -1,16 +0,0 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQIzBAABCgAdFiEExsJlMku+vcNQtRPQLSzvEDSSFoQFAl6oTT8ACgkQLSzvEDSS
|
||||
FoQlAQ/+N0/B4oGExn83IkG864+OW9JESj2iGcd65befEf112xJl6giWxDqL3rYo
|
||||
fvUSFYrDim10KtfQLGlGBa+ztzmf6H267Qvi8Qe/iLOjuEol9/OERKgi1Tv7o/iW
|
||||
6gntiU2YYG1Pdllqlr1w4isnkffhElr6Lze9sgR5N83qLqVewyyxBwpSqtDh5Lum
|
||||
03e2GNbbNHErNoAUYB6M4gTdKYWnhcz1lDvf8nQ4WAbSSD00H8imhLKU6fJHcoI5
|
||||
es4LSab9NFWrrOpnL7qinLZWeZIQpzxcU05tSmHoIUav3qTmuGJrNeIThmyrP72R
|
||||
K6si4aUYWfPmu0Shs78Jd/qYPSUpT3B96LeTlan+rXoBhP/tx7JmOhMntJMALLiF
|
||||
AGqxe/BLebBjp+MbValRiipQNRqUtb12POixq+o45td5Jlq4tJZha8DDIRiS1Qd7
|
||||
rCoZq0cUBa26pS+6gdzwL28/h0z4XvOxheKiQTSVqj5rTtbqEhfxG7XLZVKj4UwV
|
||||
DeiV5HrhTknfN+zuF+WKbGLRvoHI/rTluIKv8umF3LSWiSR84ZLOx8vC4LwAE/xT
|
||||
Pqyl0VKVHftlJU4emml8WKyFXTGTv24ejIPZfzE7bjsqBKFAm5RPhT+b5tid3oOj
|
||||
EMMDApkcf+xP8j8QjVL5uHdpHTqImP2QM6FovheuS4EflyE4Axs=
|
||||
=tBAs
|
||||
-----END PGP SIGNATURE-----
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:fc77324c4f820a09052a7785549b8035ff8d3461ded5bbd80d252ae7d1cd3aa5
|
||||
size 9469251
|
||||
10
cmake-3.17.3-SHA-256.txt
Normal file
10
cmake-3.17.3-SHA-256.txt
Normal file
@ -0,0 +1,10 @@
|
||||
3cc6538f000e010e0002dc2d27d93f6a6f071218a3044808bdb6db98228b32ba cmake-3.17.3-Darwin-x86_64.dmg
|
||||
2ad1413510681b041ec305923c6ccbc64b0fed6608df82f5543577f7b4b88305 cmake-3.17.3-Darwin-x86_64.tar.gz
|
||||
1a99f573512793224991d24ad49283f017fa544524d8513667ea3cb89cbe368b cmake-3.17.3-Linux-x86_64.sh
|
||||
da8093956f0b4ae30293c9db498da9bdeaeea4e7a2b1f2d1637ddda064d06dd0 cmake-3.17.3-Linux-x86_64.tar.gz
|
||||
84858b7bdda0d30d372104bcc70635f1b30895f5bece1d85f5598411d13231d9 cmake-3.17.3-win32-x86.msi
|
||||
1a7d82fe79b295461e8fe91e6d3d97a43c01cf954426c8b10a108575c1aa4ee1 cmake-3.17.3-win32-x86.zip
|
||||
1ad34c10f792d952c179708c114e01ef6411520a82182abe393b54cff558926c cmake-3.17.3-win64-x64.msi
|
||||
8a02de221aa96c236a947b28ca1bd6327b9bb82fa74b91e5caa49ffd6a642ae2 cmake-3.17.3-win64-x64.zip
|
||||
0bd60d512275dc9f6ef2a2865426a184642ceb3761794e6b65bff233b91d8c40 cmake-3.17.3.tar.gz
|
||||
e34320e1c896b8ee9fc627a20f5271db7c08691f769874d294bf9f54aa79b352 cmake-3.17.3.zip
|
||||
16
cmake-3.17.3-SHA-256.txt.asc
Normal file
16
cmake-3.17.3-SHA-256.txt.asc
Normal file
@ -0,0 +1,16 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQIzBAABCgAdFiEExsJlMku+vcNQtRPQLSzvEDSSFoQFAl7Pp3UACgkQLSzvEDSS
|
||||
FoSV7hAAoBhocG5fhk1WDoperYCx6haIIXfVuDrNhEu9v8jz43iXE17r8iCgG7T2
|
||||
UEIW92wj/IaEjYbwjLS7hYOFyMqs2Yr9Js3ncNBCXAgYuZzdZq2BmWCyfX4GlmC1
|
||||
9XrvxqMAseT1RLXOEenHaUun6f7kQtvoz2ALFnNUQObAxXZXtWt8+CVDk6D4n4vW
|
||||
93zolNrN4qv4tDA5ZRa0Wp+nUr25/8a/vPfhwBcZj4C8DvErah5/gJQ8fRMLkUUb
|
||||
+stuLxfRIc797kq76htuWSuz+rhPb3c3+ww3toiERduO67a/kPS+jaMPbMkNp6lq
|
||||
YTDSO2mUn0B5Qp4fWWqimkRKvY/TIgzcc2IBcdC0GS1sLFaC9fi7D5X1TR2lmaBv
|
||||
bsIEiXNCp3Q64TEo4y3IBqAdGQ1OTy1xfJEetacR3KdWC94PEMrSckltrFKBieB4
|
||||
cuL05SIihqol82uYHae3MwcmRWtJNDEfHe/p0ac3dMPxxCZ8vARm9751GScPvkvq
|
||||
5tdgIZmbxb+AxhWAPA6IQjmHlE9AQc4q/ct3S31LSVVjs1ZVvjYvOdkS3MtSdoy+
|
||||
Pfv1GRFbZncwxG27aZFqjqzRTvGK8b+kP7afcTK+34sarqcuSc6/2l+0Y7xuBdKE
|
||||
eB7HcSMbWWgGRhlQ0BLP6RoNtKPN89Y2rONJBks9hhIWahwMF2E=
|
||||
=ykzi
|
||||
-----END PGP SIGNATURE-----
|
||||
3
cmake-3.17.3.tar.gz
Normal file
3
cmake-3.17.3.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:0bd60d512275dc9f6ef2a2865426a184642ceb3761794e6b65bff233b91d8c40
|
||||
size 9470753
|
||||
@ -1,9 +1,14 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri May 29 06:42:43 UTC 2020 - Vítězslav Čížek <vcizek@suse.com>
|
||||
Sat May 30 18:31:12 UTC 2020 - Andreas Stieger <andreas.stieger@gmx.de>
|
||||
|
||||
- FindOpenSSL: Detect OpenSSL 3.0.0 (bsc#1172267)
|
||||
https://gitlab.kitware.com/cmake/cmake/-/commit/61d746e5922de50310558364f157b261f3e7917a
|
||||
* add 0001-FindOpenSSL-Detect-OpenSSL-3.0.0.patch
|
||||
- cmake 3.17.3:
|
||||
* Selection of the Objective C or C++ compiler now considers the
|
||||
CC or CXX environment variable if the OBJC or OBJCXX
|
||||
environment variable is not set
|
||||
* The FindPkgConfig module now extracts include directories
|
||||
prefixed with -isystem into the *_INCLUDE_DIRS variables and
|
||||
INTERFACE_INCLUDE_DIRECTORIES target properties
|
||||
* FindOpenSSL: Detect OpenSSL 3.0.0 (bsc#1172267)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat May 2 21:50:30 UTC 2020 - Andreas Stieger <andreas.stieger@gmx.de>
|
||||
|
||||
@ -37,7 +37,7 @@
|
||||
%endif
|
||||
%define shortversion 3.17
|
||||
Name: cmake%{?psuffix}
|
||||
Version: 3.17.2
|
||||
Version: 3.17.3
|
||||
Release: 0
|
||||
Summary: Cross-platform make system
|
||||
License: BSD-3-Clause
|
||||
@ -55,7 +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
|
||||
Patch3: 0001-FindOpenSSL-Detect-OpenSSL-3.0.0.patch
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: pkgconfig
|
||||
|
||||
Loading…
Reference in New Issue
Block a user