cmake-3.27.0-rc2
This commit is contained in:
parent
6412e59e91
commit
a6a357b9e1
@ -1,42 +0,0 @@
|
|||||||
From 3e4cc3841006819dfefe6f0735b4f120f8d4f8f8 Mon Sep 17 00:00:00 2001
|
|
||||||
From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= <besser82@fedoraproject.org>
|
|
||||||
Date: Thu, 8 Jun 2023 20:44:46 +0200
|
|
||||||
Subject: [PATCH] bootstrap: Add --(no-)system-cppdap configuration switch.
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Type: text/plain; charset=UTF-8
|
|
||||||
Content-Transfer-Encoding: 8bit
|
|
||||||
|
|
||||||
Signed-off-by: Björn Esser <besser82@fedoraproject.org>
|
|
||||||
---
|
|
||||||
bootstrap | 6 ++++--
|
|
||||||
1 file changed, 4 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/bootstrap b/bootstrap
|
|
||||||
index 109e450548..cc604256d8 100755
|
|
||||||
--- a/bootstrap
|
|
||||||
+++ b/bootstrap
|
|
||||||
@@ -667,6 +667,8 @@ Configuration:
|
|
||||||
(for use only by package maintainers)
|
|
||||||
--no-system-libs use all cmake-provided third-party libraries
|
|
||||||
(default)
|
|
||||||
+ --system-cppdap use system-installed cppdap library
|
|
||||||
+ --no-system-cppdap use cmake-provided cppdap library (default)
|
|
||||||
--system-curl use system-installed curl library
|
|
||||||
--no-system-curl use cmake-provided curl library (default)
|
|
||||||
--system-expat use system-installed expat library
|
|
||||||
@@ -954,10 +956,10 @@ while test $# != 0; do
|
|
||||||
--init=*) cmake_init_file=`cmake_arg "$1"` ;;
|
|
||||||
--system-libs) cmake_bootstrap_system_libs="${cmake_bootstrap_system_libs} -DCMAKE_USE_SYSTEM_LIBRARIES=1" ;;
|
|
||||||
--no-system-libs) cmake_bootstrap_system_libs="${cmake_bootstrap_system_libs} -DCMAKE_USE_SYSTEM_LIBRARIES=0" ;;
|
|
||||||
- --system-bzip2|--system-curl|--system-expat|--system-jsoncpp|--system-libarchive|--system-librhash|--system-zlib|--system-liblzma|--system-nghttp2|--system-zstd|--system-libuv)
|
|
||||||
+ --system-bzip2|--system-cppdap|--system-curl|--system-expat|--system-jsoncpp|--system-libarchive|--system-librhash|--system-zlib|--system-liblzma|--system-nghttp2|--system-zstd|--system-libuv)
|
|
||||||
lib=`cmake_arg "$1" "--system-"`
|
|
||||||
cmake_bootstrap_system_libs="${cmake_bootstrap_system_libs} -DCMAKE_USE_SYSTEM_LIBRARY_`cmake_toupper $lib`=1" ;;
|
|
||||||
- --no-system-bzip2|--no-system-curl|--no-system-expat|--no-system-jsoncpp|--no-system-libarchive|--no-system-librhash|--no-system-zlib|--no-system-liblzma|--no-system-nghttp2|--no-system-zstd|--no-system-libuv)
|
|
||||||
+ --no-system-bzip2|--no-system-cppdap|--no-system-curl|--no-system-expat|--no-system-jsoncpp|--no-system-libarchive|--no-system-librhash|--no-system-zlib|--no-system-liblzma|--no-system-nghttp2|--no-system-zstd|--no-system-libuv)
|
|
||||||
lib=`cmake_arg "$1" "--no-system-"`
|
|
||||||
cmake_bootstrap_system_libs="${cmake_bootstrap_system_libs} -DCMAKE_USE_SYSTEM_LIBRARY_`cmake_toupper $lib`=0" ;;
|
|
||||||
--bootstrap-system-libuv) bootstrap_system_libuv="1" ;;
|
|
||||||
--
|
|
||||||
2.40.1
|
|
||||||
|
|
@ -72,7 +72,7 @@
|
|||||||
%global baserelease 1
|
%global baserelease 1
|
||||||
|
|
||||||
# Set to RC version if building RC, else comment out.
|
# Set to RC version if building RC, else comment out.
|
||||||
%global rcsuf rc1
|
%global rcsuf rc2
|
||||||
|
|
||||||
%if 0%{?rcsuf:1}
|
%if 0%{?rcsuf:1}
|
||||||
%global pkg_version %{major_version}.%{minor_version}.%{patch_version}~%{rcsuf}
|
%global pkg_version %{major_version}.%{minor_version}.%{patch_version}~%{rcsuf}
|
||||||
@ -114,8 +114,6 @@ Source5: %{name}.req
|
|||||||
# http://public.kitware.com/Bug/view.php?id=12965
|
# http://public.kitware.com/Bug/view.php?id=12965
|
||||||
# https://bugzilla.redhat.com/show_bug.cgi?id=822796
|
# https://bugzilla.redhat.com/show_bug.cgi?id=822796
|
||||||
Patch100: %{name}-findruby.patch
|
Patch100: %{name}-findruby.patch
|
||||||
# https://gitlab.kitware.com/cmake/cmake/-/merge_requests/8550
|
|
||||||
Patch101: 0001-bootstrap-Add-no-system-cppdap-configuration-switch.patch
|
|
||||||
|
|
||||||
# Patch for renaming on EPEL
|
# Patch for renaming on EPEL
|
||||||
%if 0%{?name_suffix:1}
|
%if 0%{?name_suffix:1}
|
||||||
@ -555,6 +553,9 @@ popd
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Jun 12 2023 Björn Esser <besser82@fedoraproject.org> - 3.27.0~rc2-1
|
||||||
|
- cmake-3.27.0-rc2
|
||||||
|
|
||||||
* Thu Jun 08 2023 Björn Esser <besser82@fedoraproject.org> - 3.27.0~rc1-1
|
* Thu Jun 08 2023 Björn Esser <besser82@fedoraproject.org> - 3.27.0~rc1-1
|
||||||
- cmake-3.27.0-rc1
|
- cmake-3.27.0-rc1
|
||||||
- Use CMake-provided cppdap
|
- Use CMake-provided cppdap
|
||||||
|
2
sources
2
sources
@ -1 +1 @@
|
|||||||
SHA512 (cmake-3.27.0-rc1.tar.gz) = 02ea3ed06ccc339980235371de0b3c823f92cdd46bc4de3b0bb5788cd1265c292e70dd824d2fd3740ec67fa63a5e2a903a32735f6073d8843465e300ccef5e6d
|
SHA512 (cmake-3.27.0-rc2.tar.gz) = c354caac080510d779c112f5301a6158d42157e518176b63d1784fbbf3a19fe0f62028f1d5e4b4f227002e9c3b4309c31826024ea9b2d6e130d5db9bcec6e9d8
|
||||||
|
Loading…
Reference in New Issue
Block a user