Skip to content

Commit

Permalink
build: Make packages related variables simply expanded ones
Browse files Browse the repository at this point in the history
  • Loading branch information
hebasto committed Jul 20, 2022
1 parent 34033f5 commit df6dccd
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 21 deletions.
36 changes: 18 additions & 18 deletions depends/packages/packages.mk
Original file line number Diff line number Diff line change
@@ -1,29 +1,29 @@
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
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

usdt_linux_packages=systemtap
usdt_linux_packages := systemtap

darwin_native_packages = native_ds_store native_mac_alias
darwin_native_packages := native_ds_store native_mac_alias

ifneq ($(build_os),darwin)
darwin_native_packages += native_cctools native_libtapi
Expand Down
6 changes: 3 additions & 3 deletions depends/packages/qt.mk
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ $(package)_file_name := qtbase-$($(package)_suffix)
$(package)_sha256_hash := 26394ec9375d52c1592bd7b689b1619c6b8dbe9b6f91fdd5c355589787f3a0b6
$(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
$(package)_linguist_tools := lrelease lupdate lconvert
$(package)_patches := qt.pro
$(package)_patches += qttools_src.pro
$(package)_patches += mac-qmake.conf
$(package)_patches += fix_qt_pkgconfig.patch
Expand All @@ -29,7 +29,7 @@ $(package)_qttranslations_sha256_hash := 5d7869f670a135ad0986e266813b9dd5bbae2b0
$(package)_qttools_file_name := qttools-$($(package)_suffix)
$(package)_qttools_sha256_hash := 463b2fe71a085e7ab4e39333ae360ab0ec857b966d7a08f752c427e5df55f90d

$(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
Expand Down

0 comments on commit df6dccd

Please sign in to comment.