fixup! build: Generate toolchain.cmake in depends

hebasto · Jul 31, 2024 · 20ef783 · 20ef783
1 parent 19d4d92
commit 20ef783
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 18 deletions.
diff --git a/depends/Makefile b/depends/Makefile
@@ -283,14 +283,14 @@ $(host_prefix)/toolchain.cmake : toolchain.cmake.in $(host_prefix)/.stamp_$(fina
             -e 's|@LDFLAGS@|$(strip $(host_LDFLAGS))|' \
             -e 's|@LDFLAGS_RELEASE@|$(strip $(host_release_LDFLAGS))|' \
             -e 's|@LDFLAGS_DEBUG@|$(strip $(host_debug_LDFLAGS))|' \
-            -e 's|@no_qt@|$(NO_QT)|' \
-            -e 's|@no_qr@|$(NO_QR)|' \
-            -e 's|@no_zmq@|$(NO_ZMQ)|' \
-            -e 's|@no_wallet@|$(NO_WALLET)|' \
-            -e 's|@no_bdb@|$(NO_BDB)|' \
-            -e 's|@no_sqlite@|$(NO_SQLITE)|' \
-            -e 's|@no_upnp@|$(NO_UPNP)|' \
-            -e 's|@no_natpmp@|$(NO_NATPMP)|' \
+            -e 's|@qt_packages@|$(qt_packages_)|' \
+            -e 's|@qrencode_packages@|$(qrencode_packages_)|' \
+            -e 's|@zmq_packages@|$(zmq_packages_)|' \
+            -e 's|@wallet_packages@|$(wallet_packages_)|' \
+            -e 's|@bdb_packages@|$(bdb_packages_)|' \
+            -e 's|@sqlite_packages@|$(sqlite_packages_)|' \
+            -e 's|@upnp_packages@|$(upnp_packages_)|' \
+            -e 's|@natpmp_packages@|$(natpmp_packages_)|' \
             -e 's|@usdt_packages@|$(usdt_packages_)|' \
             -e 's|@no_harden@|$(NO_HARDEN)|' \
             -e 's|@multiprocess@|$(MULTIPROCESS)|' \

diff --git a/depends/toolchain.cmake.in b/depends/toolchain.cmake.in
@@ -129,53 +129,64 @@ set(PKG_CONFIG_ARGN --static)
 
 
 # Set configuration options for the main build system.
-if("@no_qt@")
+set(qt_packages @qt_packages@)
+if("${qt_packages}" STREQUAL "")
   set(BUILD_GUI OFF CACHE BOOL "")
 else()
   set(BUILD_GUI ON CACHE BOOL "")
 endif()
 
-if(NOT WITH_QRENCODE AND "@no_qr@" STREQUAL "1")
-  set(WITH_QRENCODE OFF CACHE STRING "Enable QR code support.")
+set(qrencode_packages @qrencode_packages@)
+if("${qrencode_packages}" STREQUAL "")
+  set(WITH_QRENCODE OFF CACHE BOOL "")
+else()
+  set(WITH_QRENCODE ON CACHE BOOL "")
 endif()
 
-if("@no_zmq@")
+set(zmq_packages @zmq_packages@)
+if("${zmq_packages}" STREQUAL "")
   set(WITH_ZMQ OFF CACHE BOOL "")
 else()
   set(WITH_ZMQ ON CACHE BOOL "")
 endif()
 
-if("@no_wallet@")
+set(wallet_packages @wallet_packages@)
+if("${wallet_packages}" STREQUAL "")
   set(ENABLE_WALLET OFF CACHE BOOL "")
 else()
   set(ENABLE_WALLET ON CACHE BOOL "")
 endif()
 
-if("@no_wallet@" OR "@no_bdb@")
+set(bdb_packages @bdb_packages@)
+if("${wallet_packages}" STREQUAL "" OR "${bdb_packages}" STREQUAL "")
   set(WITH_BDB OFF CACHE BOOL "")
 else()
   set(WITH_BDB ON CACHE BOOL "")
 endif()
 
-if("@no_wallet@" OR "@no_sqlite@")
+set(sqlite_packages @sqlite_packages@)
+if("${wallet_packages}" STREQUAL "" OR "${sqlite_packages}" STREQUAL "")
   set(WITH_SQLITE OFF CACHE BOOL "")
 else()
   set(WITH_SQLITE ON CACHE BOOL "")
 endif()
 
-if("@no_upnp@")
+set(upnp_packages @upnp_packages@)
+if("${upnp_packages}" STREQUAL "")
   set(WITH_MINIUPNPC OFF CACHE BOOL "")
 else()
   set(WITH_MINIUPNPC ON CACHE BOOL "")
 endif()
 
-if("@no_natpmp@")
+set(natpmp_packages @natpmp_packages@)
+if("${natpmp_packages}" STREQUAL "")
   set(WITH_NATPMP OFF CACHE BOOL "")
 else()
   set(WITH_NATPMP ON CACHE BOOL "")
 endif()
 
-if("@usdt_packages@" STREQUAL "")
+set(usdt_packages @usdt_packages@)
+if("${usdt_packages}" STREQUAL "")
   set(WITH_USDT OFF CACHE BOOL "")
 else()
   set(WITH_USDT ON CACHE BOOL "")