43 lines
2.6 KiB
Diff
43 lines
2.6 KiB
Diff
|
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
|
||
|
|
|