From d596658022bbd10b818391df7f5133b545b54485 Mon Sep 17 00:00:00 2001 From: Daira Hopwood Date: Sat, 4 Mar 2017 06:02:29 +0000 Subject: [PATCH] Remove NO_QT make option. Signed-off-by: Daira Hopwood --- contrib/gitian-descriptors/gitian-linux.yml | 2 +- depends/Makefile | 8 ++----- depends/README.md | 1 - depends/config.site.in | 25 +-------------------- zcutil/build.sh | 2 +- 5 files changed, 5 insertions(+), 33 deletions(-) diff --git a/contrib/gitian-descriptors/gitian-linux.yml b/contrib/gitian-descriptors/gitian-linux.yml index 15666761..2d79aa0a 100644 --- a/contrib/gitian-descriptors/gitian-linux.yml +++ b/contrib/gitian-descriptors/gitian-linux.yml @@ -32,7 +32,7 @@ script: | WRAP_DIR=$HOME/wrapped HOSTS="x86_64-unknown-linux-gnu" CONFIGFLAGS="--enable-glibc-back-compat --enable-reduce-exports --disable-bench --disable-gui-tests --with-gui=no --enable-hardening" - MAKEOPTS="V=1 NO_QT=1" + MAKEOPTS="V=1" FAKETIME_HOST_PROGS="" FAKETIME_PROGS="date ar ranlib nm strip objcopy" HOST_CFLAGS="-fwrapv -fno-strict-aliasing -Werror -g" diff --git a/depends/Makefile b/depends/Makefile index 3d8dd25c..0e9e880a 100644 --- a/depends/Makefile +++ b/depends/Makefile @@ -3,7 +3,6 @@ SOURCES_PATH ?= $(BASEDIR)/sources BASE_CACHE ?= $(BASEDIR)/built SDK_PATH ?= $(BASEDIR)/SDKs -NO_QT ?= NO_WALLET ?= NO_UPNP ?= FALLBACK_DOWNLOAD_PATH ?= https://z.cash/depends-sources @@ -73,13 +72,11 @@ include builders/$(build_os).mk include builders/default.mk include packages/packages.mk -qt_packages_$(NO_QT) = $(qt_packages) $(qt_$(host_os)_packages) -qt_native_packages_$(NO_QT) = $(qt_native_packages) wallet_packages_$(NO_WALLET) = $(wallet_packages) upnp_packages_$(NO_UPNP) = $(upnp_packages) -packages += $($(host_arch)_$(host_os)_packages) $($(host_os)_packages) $(qt_packages_) $(wallet_packages_) $(upnp_packages_) -native_packages += $($(host_arch)_$(host_os)_native_packages) $($(host_os)_native_packages) $(qt_native_packages_) +packages += $($(host_arch)_$(host_os)_packages) $($(host_os)_packages) $(wallet_packages_) $(upnp_packages_) +native_packages += $($(host_arch)_$(host_os)_native_packages) $($(host_os)_native_packages) all_packages = $(packages) $(native_packages) meta_depends = Makefile funcs.mk builders/default.mk hosts/default.mk hosts/$(host_os).mk builders/$(build_os).mk @@ -114,7 +111,6 @@ $(host_prefix)/share/config.site : config.site.in $(host_prefix)/.stamp_$(final_ -e 's|@CXXFLAGS@|$(strip $(host_CXXFLAGS) $(host_$(release_type)_CXXFLAGS))|' \ -e 's|@CPPFLAGS@|$(strip $(host_CPPFLAGS) $(host_$(release_type)_CPPFLAGS))|' \ -e 's|@LDFLAGS@|$(strip $(host_LDFLAGS) $(host_$(release_type)_LDFLAGS))|' \ - -e 's|@no_qt@|$(NO_QT)|' \ -e 's|@no_wallet@|$(NO_WALLET)|' \ -e 's|@no_upnp@|$(NO_UPNP)|' \ -e 's|@debug@|$(DEBUG)|' \ diff --git a/depends/README.md b/depends/README.md index d85e652c..663d4958 100644 --- a/depends/README.md +++ b/depends/README.md @@ -34,7 +34,6 @@ The following can be set when running make: make FOO=bar BASE_CACHE: built packages will be placed here SDK_PATH: Path where sdk's can be found (used by OSX) FALLBACK_DOWNLOAD_PATH: If a source file can't be fetched, try here before giving up - 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 diff --git a/depends/config.site.in b/depends/config.site.in index 28c1f45a..1d63e442 100644 --- a/depends/config.site.in +++ b/depends/config.site.in @@ -7,18 +7,6 @@ ac_tool_prefix=${host_alias}- if test -z $with_boost; then with_boost=$depends_prefix fi -if test -z $with_qt_plugindir; then - with_qt_plugindir=$depends_prefix/plugins -fi -if test -z $with_qt_translationdir; then - with_qt_translationdir=$depends_prefix/translations -fi -if test -z $with_qt_bindir; then - with_qt_bindir=$depends_prefix/native/bin -fi -if test -z $with_protoc_bindir; then - with_protoc_bindir=$depends_prefix/native/bin -fi # Disable comparison utility (#592) #if test -z $with_comparison_tool; then # with_comparison_tool=$depends_prefix/native/share/BitcoindComparisonTool_jar/BitcoindComparisonTool.jar @@ -33,24 +21,13 @@ if test -z $with_miniupnpc && test -n "@no_upnp@"; then with_miniupnpc=no fi -if test -z $with_gui && test -n "@no_qt@"; then - with_gui=no -fi +with_gui=no if test x@host_os@ = xdarwin; then BREW=no PORT=no fi -if test x@host_os@ = xmingw32; then - if test -z $with_qt_incdir; then - with_qt_incdir=$depends_prefix/include - fi - if test -z $with_qt_libdir; then - with_qt_libdir=$depends_prefix/lib - fi -fi - PATH=$depends_prefix/native/bin:$PATH PKG_CONFIG="`which pkg-config` --static" diff --git a/zcutil/build.sh b/zcutil/build.sh index 8ec020f8..404a76e7 100755 --- a/zcutil/build.sh +++ b/zcutil/build.sh @@ -75,7 +75,7 @@ fi PREFIX="$(pwd)/depends/$BUILD/" -HOST="$HOST" BUILD="$BUILD" "$MAKE" "$@" -C ./depends/ V=1 NO_QT=1 +HOST="$HOST" BUILD="$BUILD" "$MAKE" "$@" -C ./depends/ V=1 ./autogen.sh CC="$CC" CXX="$CXX" ./configure --prefix="${PREFIX}" --host="$HOST" --build="$BUILD" --with-gui=no "$HARDENING_ARG" "$LCOV_ARG" "$TEST_ARG" "$MINING_ARG" CXXFLAGS='-fwrapv -fno-strict-aliasing -Werror -g' "$MAKE" "$@" V=1