depends: always use static qt5 for linux
This commit is contained in:
parent
3448b132c4
commit
d23b0a2711
3 changed files with 1 additions and 8 deletions
|
@ -6,7 +6,6 @@ SDK_PATH ?= $(BASEDIR)/SDKs
|
|||
NO_QT ?=
|
||||
NO_WALLET ?=
|
||||
NO_UPNP ?=
|
||||
USE_LINUX_STATIC_QT5 ?=
|
||||
FALLBACK_DOWNLOAD_PATH ?= https://bitcoincore.org/depends-sources
|
||||
|
||||
BUILD = $(shell ./config.guess)
|
||||
|
|
|
@ -23,7 +23,6 @@ NO_QT: Don't download/build/cache qt and its dependencies
|
|||
NO_WALLET: Don't download/build/cache libs needed to enable the wallet
|
||||
NO_UPNP: Don't download/build/cache packages needed for enabling upnp
|
||||
DEBUG: disable some optimizations and enable more runtime checking
|
||||
USE_LINUX_STATIC_QT5: Build a static qt5 rather than shared qt4. Linux only.
|
||||
|
||||
If some packages are not built, for example 'make NO_WALLET=1', the appropriate
|
||||
options will be passed to bitcoin's configure. In this case, --disable-wallet.
|
||||
|
|
|
@ -4,15 +4,10 @@ native_packages := native_ccache native_comparisontool
|
|||
qt_native_packages = native_protobuf
|
||||
qt_packages = qrencode protobuf
|
||||
|
||||
qt46_linux_packages = qt46 expat dbus libxcb xcb_proto libXau xproto freetype libX11 xextproto libXext xtrans libICE libSM
|
||||
qt5_linux_packages= qt expat dbus libxcb xcb_proto libXau xproto freetype fontconfig libX11 xextproto libXext xtrans
|
||||
|
||||
qt_linux_packages= qt expat dbus libxcb xcb_proto libXau xproto freetype fontconfig libX11 xextproto libXext xtrans
|
||||
qt_darwin_packages=qt
|
||||
qt_mingw32_packages=qt
|
||||
|
||||
qt_linux_$(USE_LINUX_STATIC_QT5):=$(qt5_linux_packages)
|
||||
qt_linux_:=$(qt46_linux_packages)
|
||||
qt_linux_packages:=$(qt_linux_$(USE_LINUX_STATIC_QT5))
|
||||
|
||||
wallet_packages=bdb
|
||||
|
||||
|
|
Loading…
Reference in a new issue