depends: Make packages related variables simply expanded ones

bitcoin · Jul 26, 2021 · fdaeb52 · fdaeb52
1 parent 8dc75fd
commit fdaeb52
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 23 deletions.
diff --git a/depends/packages/native_b2.mk b/depends/packages/native_b2.mk
@@ -5,9 +5,9 @@ $(package)_file_name := $(boost_file_name)
 $(package)_sha256_hash := $(boost_sha256_hash)
 $(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,33 +1,33 @@
-packages:=boost libevent
+packages := boost libevent
 
-qrencode_packages = qrencode
+qrencode_packages := qrencode
 
-qt_linux_packages:=qt expat libxcb xcb_proto libXau xproto freetype fontconfig libxkbcommon
-qt_android_packages=qt
+qt_linux_packages := qt expat libxcb xcb_proto libXau xproto freetype fontconfig libxkbcommon
+qt_android_packages := qt
 
-qt_darwin_packages=qt
-qt_mingw32_packages=qt
+qt_darwin_packages := qt
+qt_mingw32_packages := qt
 
-bdb_packages=bdb
-sqlite_packages=sqlite
+bdb_packages := bdb
+sqlite_packages := sqlite
 
-zmq_packages=zeromq
+zmq_packages := zeromq
 
-upnp_packages=miniupnpc
-natpmp_packages=libnatpmp
+upnp_packages := miniupnpc
+natpmp_packages := libnatpmp
 
-multiprocess_packages = libmultiprocess capnp
-multiprocess_native_packages = native_libmultiprocess native_capnp
+multiprocess_packages := libmultiprocess capnp
+multiprocess_native_packages := native_libmultiprocess native_capnp
 
-darwin_native_packages = native_ds_store native_mac_alias
+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,21 +6,21 @@ $(package)_file_name := qtbase-$($(package)_suffix)
 $(package)_sha256_hash := 1c1b4e33137ca77881074c140d54c3c9747e845a31338cfe8680f171f0bc3a39
 $(package)_linux_dependencies := freetype fontconfig libxcb libxkbcommon
 $(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 += support_new_android_ndks.patch fix_android_jni_static.patch dont_hardcode_pwd.patch
-$(package)_patches+= no_sdk_version_check.patch
-$(package)_patches+= fix_lib_paths.patch fix_android_pch.patch
-$(package)_patches+= qtbase-moc-ignore-gcc-macro.patch fix_limits_header.patch
+$(package)_patches += no_sdk_version_check.patch
+$(package)_patches += fix_lib_paths.patch fix_android_pch.patch
+$(package)_patches += qtbase-moc-ignore-gcc-macro.patch fix_limits_header.patch
 
 $(package)_qttranslations_file_name := qttranslations-$($(package)_suffix)
 $(package)_qttranslations_sha256_hash := 577b0668a777eb2b451c61e8d026d79285371597ce9df06b6dee6c814164b7c3
 
 $(package)_qttools_file_name := qttools-$($(package)_suffix)
 $(package)_qttools_sha256_hash := 98b2aaca230458f65996f3534fd471d2ffd038dd58ac997c0589c06dc2385b4f
 
-$(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