build: Make packages related variables simply expanded ones

bitcoin · Feb 11, 2022 · 17ef4c9 · 17ef4c9
1 parent 935a1af
commit 17ef4c9
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 24 deletions.
diff --git a/depends/packages/native_b2.mk b/depends/packages/native_b2.mk
@@ -6,9 +6,9 @@ $(package)_sha256_hash := d73a8da01e8bf8c7eda40b4c84915071a8c8a0df4a6734537ddde4
 
 $(package)_build_subdir := tools/build/src/engine
 ifneq (,$(findstring clang,$($(package)_cxx)))
-$(package)_toolset_$(host_os)=clang
+$(package)_toolset_$(host_os) := clang
 else
-$(package)_toolset_$(host_os)=gcc
+$(package)_toolset_$(host_os) := gcc
 endif
 
 define $(package)_build_cmds

diff --git a/depends/packages/packages.mk b/depends/packages/packages.mk
@@ -1,37 +1,38 @@
-packages:=boost libevent
+packages := boost libevent
 
-qrencode_linux_packages = qrencode
-qrencode_android_packages = qrencode
-qrencode_darwin_packages = qrencode
-qrencode_mingw32_packages = qrencode
+qrencode_linux_packages := qrencode
+qrencode_android_packages := qrencode
+qrencode_darwin_packages := qrencode
+qrencode_mingw32_packages := qrencode
 
-qt_linux_packages:=qt expat libxcb xcb_proto libXau xproto freetype fontconfig libxkbcommon libxcb_util libxcb_util_render libxcb_util_keysyms libxcb_util_image libxcb_util_wm
-qt_android_packages=qt
-qt_darwin_packages=qt
-qt_mingw32_packages=qt
+qt_linux_packages := qt expat libxcb xcb_proto libXau xproto freetype fontconfig libxkbcommon libxcb_util libxcb_util_render libxcb_util_keysyms libxcb_util_image libxcb_util_wm
+qt_android_packages := qt
 
-bdb_packages=bdb
-sqlite_packages=sqlite
+qt_darwin_packages := qt
+qt_mingw32_packages := qt
 
-zmq_packages=zeromq
+bdb_packages := bdb
+sqlite_packages := sqlite
 
-upnp_packages=miniupnpc
-natpmp_packages=libnatpmp
+zmq_packages := zeromq
 
-multiprocess_packages = libmultiprocess capnp
-multiprocess_native_packages = native_libmultiprocess native_capnp
+upnp_packages := miniupnpc
+natpmp_packages := libnatpmp
 
-usdt_linux_packages=systemtap
+multiprocess_packages := libmultiprocess capnp
+multiprocess_native_packages := native_libmultiprocess native_capnp
 
-darwin_native_packages = native_ds_store native_mac_alias
+usdt_linux_packages := systemtap
+
+darwin_native_packages := native_ds_store native_mac_alias
 
 $(host_arch)_$(host_os)_native_packages += native_b2
 
 ifneq ($(build_os),darwin)
 darwin_native_packages += native_cctools native_libtapi native_libdmg-hfsplus
 
 ifeq ($(strip $(FORCE_USE_SYSTEM_CLANG)),)
-darwin_native_packages+= native_clang
+darwin_native_packages += native_clang
 endif
 
 endif
diff --git a/depends/packages/qt.mk b/depends/packages/qt.mk
@@ -6,8 +6,8 @@ $(package)_file_name := qtbase-$($(package)_suffix)
 $(package)_sha256_hash := 909fad2591ee367993a75d7e2ea50ad4db332f05e1c38dd7a5a274e156a4e0f8
 $(package)_linux_dependencies := freetype fontconfig libxcb libxkbcommon libxcb_util libxcb_util_render libxcb_util_keysyms libxcb_util_image libxcb_util_wm
 $(package)_qt_libs := corelib network widgets gui plugins testlib
-$(package)_linguist_tools = lrelease lupdate lconvert
-$(package)_patches = qt.pro qttools_src.pro
+$(package)_linguist_tools := lrelease lupdate lconvert
+$(package)_patches := qt.pro qttools_src.pro
 $(package)_patches += fix_qt_pkgconfig.patch mac-qmake.conf fix_no_printer.patch no-xlib.patch
 $(package)_patches += dont_use_avx_android_x86_64.patch dont_hardcode_x86_64.patch fix_montery_include.patch
 $(package)_patches += fix_android_jni_static.patch dont_hardcode_pwd.patch
@@ -21,7 +21,7 @@ $(package)_qttranslations_sha256_hash := d5788e86257b21d5323f1efd94376a213e091d1
 $(package)_qttools_file_name := qttools-$($(package)_suffix)
 $(package)_qttools_sha256_hash := c189d0ce1ff7c739db9a3ace52ac3e24cb8fd6dbf234e49f075249b38f43c1cc
 
-$(package)_extra_sources  = $($(package)_qttranslations_file_name)
+$(package)_extra_sources := $($(package)_qttranslations_file_name)
 $(package)_extra_sources += $($(package)_qttools_file_name)
 
 define $(package)_set_vars