diff options
| author | Cory Fields <cory-nospam-@coryfields.com> | 2015-02-25 14:01:02 -0500 |
|---|---|---|
| committer | Cory Fields <cory-nospam-@coryfields.com> | 2015-02-25 18:41:59 -0500 |
| commit | d23b0a271163d187eb362164d375148fdd752148 (patch) | |
| tree | 056677278d30b4cb119bacf53ffde22e35826904 | |
| parent | 3448b132c4150509eec9bf585552d1994fd32090 (diff) | |
depends: always use static qt5 for linux
| -rw-r--r-- | depends/Makefile | 1 | ||||
| -rw-r--r-- | depends/README.usage | 1 | ||||
| -rw-r--r-- | depends/packages/packages.mk | 7 |
3 files changed, 1 insertions, 8 deletions
diff --git a/depends/Makefile b/depends/Makefile index e2ef7ee49b..05ef33f2ee 100644 --- a/depends/Makefile +++ b/depends/Makefile @@ -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) diff --git a/depends/README.usage b/depends/README.usage index f5aa5314a1..24e1231d82 100644 --- a/depends/README.usage +++ b/depends/README.usage @@ -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. diff --git a/depends/packages/packages.mk b/depends/packages/packages.mk index 08fd8a5247..03908aba59 100644 --- a/depends/packages/packages.mk +++ b/depends/packages/packages.mk @@ -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 |