buildfixes

CryptoDragonLady · Sep 24, 2018 · 6a86c1c · 6a86c1c
1 parent dad2fb7
commit 6a86c1c
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -33,21 +33,21 @@ env:
   - RBITS=$(cat /dev/urandom | head -c 64 | base64 | tr -cd '[:alnum:]' | head -c 8 ;) 
   matrix:
   - HOST=arm-linux-gnueabihf PACKAGES="g++-arm-linux-gnueabihf"
-    CHECK_DOC=1 GOAL="install" BITCOIN_CONFIG="--enable-glibc-back-compat --enable-reduce-exports --with-gui=auto --disable-maintainer-mode"
+    CHECK_DOC=1 GOAL="install" BITCOIN_CONFIG="--enable-glibc-back-compat --enable-reduce-exports --with-gui=auto --disable-maintainer-mode --disable-zmq"
   - HOST=i686-w64-mingw32 PPA="ppa:bitcoin/bitcoin" DPKG_ADD_ARCH="i386" DEP_OPTS="" PACKAGES="python3
     python3-dev python3-pip nsis g++-mingw-w64-i686 bc faketime wine1.6 bc build-essential libc6-dev
     libtool autotools-dev automake cmake pkg-config bsdmainutils imagemagick libqt4-dev qt4-dev-tools libqt4-dev-bin libqt4-opengl-dev libqtwebkit-dev qt4-linguist-tools
     libdb4.8++ libdb4.8 libdb4.8-dev db4.8-util libdb4.8++-dev libminiupnpc-dev curl g++-mingw-w64-x86-64 mingw-w64-x86-64-dev g++-mingw-w64-i686 mingw-w64-i686-dev
     libqt5gui5 libqt5core5a libqt5dbus5 qtbase5-dev libevent-dev libboost-system-dev libboost-filesystem-dev qttools5-dev qttools5-dev-tools libminiupnpc-dev  libprotobuf-dev protobuf-compiler libqrencode-dev flex libelf-dev libdwarf-dev"
-    RUN_TESTS=false GOAL="install" BITCOIN_CONFIG="--disable-gui-tests --disable-maintainer-mode --disable-bench --enable-reduce-exports --enable-zmq --enable-gui --with-gui=auto LDFLAGS=-static-libstdc++" BDB_INCLUDE_PATH="/usr/include" BDB_LIB_PATH="/usr/lib"
+    RUN_TESTS=false GOAL="install" BITCOIN_CONFIG="--disable-gui-tests --disable-maintainer-mode --disable-bench --enable-reduce-exports --disable-zmq --enable-gui --with-gui=auto LDFLAGS=-static-libstdc++" BDB_INCLUDE_PATH="/usr/include" BDB_LIB_PATH="/usr/lib"
   - HOST=i686-w64-mingw32 PPA="ppa:bitcoin/bitcoin" DPKG_ADD_ARCH="i386" DEP_OPTS="" PACKAGES="g++-multilib python3 python3-dev python3-pip nsis bc faketime wine1.6 bc build-essential libc6-dev libtool autotools-dev automake cmake pkg-config bsdmainutils imagemagick libqt4-dev qt4-dev-tools libqt4-dev-bin libqt4-opengl-dev libqtwebkit-dev qt4-linguist-tools libminiupnpc-dev curl g++-mingw-w64-x86-64 mingw-w64-x86-64-dev g++-mingw-w64-i686 mingw-w64-i686-dev libevent-dev libboost-system-dev libboost-filesystem-dev libminiupnpc-dev  libprotobuf-dev protobuf-compiler libqrencode-dev flex libelf-dev libdwarf-dev ttf-mscorefonts-installer ttf-mscorefonts-installer nsis-pluginapi libdb4.8++ libdb4.8 libdb4.8-dev db4.8-util libdb4.8++-dev firebird-dev libegl1-mesa-dev libpq-dev libsqlite3-dev unixodbc-dev"
-    RUN_TESTS=false GOAL="install" BITCOIN_CONFIG="--disable-gui-tests --disable-bench --enable-reduce-exports --enable-zmq --enable-gui --with-gui=auto LDFLAGS=-static-libstdc++" BDB_INCLUDE_PATH="/usr/include" BDB_LIB_PATH="/usr/lib"
+    RUN_TESTS=false GOAL="install" BITCOIN_CONFIG="--disable-gui-tests --disable-bench --enable-reduce-exports --disable-zmq --enable-gui --with-gui=auto LDFLAGS=-static-libstdc++" BDB_INCLUDE_PATH="/usr/include" BDB_LIB_PATH="/usr/lib"
   - HOST=x86_64-w64-mingw32 PPA="ppa:bitcoin/bitcoin" DEP_OPTS="" PACKAGES="g++-multilib python3 python3-dev python3-pip nsis bc faketime wine1.6 bc build-essential libc6-dev libtool autotools-dev automake cmake pkg-config bsdmainutils imagemagick libqt4-dev qt4-dev-tools libqt4-dev-bin libqt4-opengl-dev libqtwebkit-dev qt4-linguist-tools libminiupnpc-dev curl g++-mingw-w64-x86-64 mingw-w64-x86-64-dev g++-mingw-w64-i686 mingw-w64-i686-dev libevent-dev libboost-system-dev libboost-filesystem-dev libminiupnpc-dev  libprotobuf-dev protobuf-compiler libqrencode-dev flex libelf-dev libdwarf-dev ttf-mscorefonts-installer ttf-mscorefonts-installer nsis-pluginapi libdb4.8++ libdb4.8 libdb4.8-dev db4.8-util libdb4.8++-dev firebird-dev libegl1-mesa-dev libpq-dev libsqlite3-dev unixodbc-dev"
-    RUN_TESTS=false GOAL="install" BITCOIN_CONFIG="--disable-gui-tests --disable-bench --enable-reduce-exports --enable-zmq --enable-gui --with-gui=auto LDFLAGS=-static-libstdc++" BDB_INCLUDE_PATH="/usr/include" BDB_LIB_PATH="/usr/lib"
+    RUN_TESTS=false GOAL="install" BITCOIN_CONFIG="--disable-gui-tests --disable-bench --enable-reduce-exports --disable-zmq --enable-gui --with-gui=auto LDFLAGS=-static-libstdc++" BDB_INCLUDE_PATH="/usr/include" BDB_LIB_PATH="/usr/lib"
   - HOST=x86_64-linux-gnu PPA="ppa:bitcoin/bitcoin" DEP_OPTS="" PACKAGES="python3 nsis g++-mingw-w64-i686 wine1.6"
     RUN_TESTS=false GOAL="install" BITCOIN_CONFIG="--enable-reduce-exports"
   - HOST=i686-linux-gnu PACKAGES="g++-multilib python3 python3-dev python3-pip nsis bc faketime wine1.6 bc build-essential libc6-dev libtool autotools-dev automake cmake pkg-config bsdmainutils imagemagick libqt4-dev qt4-dev-tools libqt4-dev-bin libqt4-opengl-dev libqtwebkit-dev qt4-linguist-tools libminiupnpc-dev curl g++-mingw-w64-x86-64 mingw-w64-x86-64-dev g++-mingw-w64-i686 mingw-w64-i686-dev libevent-dev libboost-system-dev libboost-filesystem-dev libminiupnpc-dev  libprotobuf-dev protobuf-compiler libqrencode-dev flex libelf-dev libdwarf-dev ttf-mscorefonts-installer ttf-mscorefonts-installer nsis-pluginapi libdb4.8++ libdb4.8 libdb4.8-dev db4.8-util libdb4.8++-dev firebird-dev libegl1-mesa-dev libpq-dev libsqlite3-dev unixodbc-dev"
-    DEP_OPTS="" RUN_TESTS=false GOAL="install" BITCOIN_CONFIG="--disable-gui-tests --disable-bench --enable-gui --with-gui=auto --enable-glibc-back-compat --enable-reduce-exports LDFLAGS=-static-libstdc++" USE_SHELL="/bin/dash" PYZQM=true
+    DEP_OPTS="" RUN_TESTS=false GOAL="install" BITCOIN_CONFIG="--disable-gui-tests --disable-bench --enable-gui --with-gui=auto --enable-glibc-back-compat --enable-reduce-exports LDFLAGS=-static-libstdc++" PYZQM=true
   - HOST=x86_64-linux-gnu PACKAGES="g++-multilib python3 python3-dev python3-pip nsis bc faketime wine1.6 bc build-essential libc6-dev libtool autotools-dev automake cmake pkg-config bsdmainutils imagemagick libqt4-dev qt4-dev-tools libqt4-dev-bin libqt4-opengl-dev libqtwebkit-dev qt4-linguist-tools libminiupnpc-dev curl g++-mingw-w64-x86-64 mingw-w64-x86-64-dev g++-mingw-w64-i686 mingw-w64-i686-dev libevent-dev libboost-system-dev libboost-filesystem-dev libminiupnpc-dev libprotobuf-dev protobuf-compiler libqrencode-dev flex libelf-dev libdwarf-dev ttf-mscorefonts-installer ttf-mscorefonts-installer nsis-pluginapi libdb4.8++ libdb4.8 libdb4.8-dev db4.8-util libdb4.8++-dev firebird-dev libegl1-mesa-dev libpq-dev libsqlite3-dev unixodbc-dev"
     DEP_OPTS="" RUN_TESTS=false GOAL="install" 
     BITCOIN_CONFIG="--enable-zmq --disable-gui-tests --disable-bench --disable-maintainer-mode --enable-glibc-back-compat --enable-reduce-exports --enable-gui --with-gui=auto CPPFLAGS=-DDEBUG_LOCKORDER "