diff options
| author | Riccardo Spagni <ric@spagni.net> | 2017-03-28 19:57:24 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2017-03-28 19:57:24 +0200 |
| commit | 4ca35af11ac8b41192bdb373216513e524ee4cb0 (patch) | |
| tree | 4c551980bf14d070659b8caf4e69d4e93dfe0f64 | |
| parent | a154eabf87fdfcdebd378907c59198cd1295e50f (diff) | |
| parent | b4f01b9f6a217fa475cab058d022cf5bf41e6d6c (diff) | |
| download | monzero-gui-4ca35af11ac8b41192bdb373216513e524ee4cb0.tar.gz monzero-gui-4ca35af11ac8b41192bdb373216513e524ee4cb0.tar.xz monzero-gui-4ca35af11ac8b41192bdb373216513e524ee4cb0.zip | |
Merge pull request #630
b4f01b9 linux32: use vendored libunbound (Jaquee)
f653535 linux 32 build config test (Jaquee)
| -rwxr-xr-x | get_libwallet_api.sh | 2 | ||||
| -rw-r--r-- | monero-wallet-gui.pro | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/get_libwallet_api.sh b/get_libwallet_api.sh index 084c60b6..7c1a6f50 100755 --- a/get_libwallet_api.sh +++ b/get_libwallet_api.sh @@ -154,7 +154,7 @@ elif [ "$platform" == "linux64" ]; then elif [ "$platform" == "linux32" ]; then echo "Configuring build for Linux i686" if [ "$STATIC" == true ]; then - cmake -D CMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE -D STATIC=ON -D ARCH="i686" -D BUILD_64=OFF -D BUILD_GUI_DEPS=ON -D CMAKE_INSTALL_PREFIX="$MONERO_DIR" ../.. + cmake -D CMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE -D STATIC=ON -D ARCH="i686" -D BUILD_64=OFF -D BUILD_GUI_DEPS=ON -D INSTALL_VENDORED_LIBUNBOUND=ON -D CMAKE_INSTALL_PREFIX="$MONERO_DIR" ../.. else cmake -D CMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE -D BUILD_GUI_DEPS=ON -D CMAKE_INSTALL_PREFIX="$MONERO_DIR" ../.. fi diff --git a/monero-wallet-gui.pro b/monero-wallet-gui.pro index 2ece7444..cf7d6e50 100644 --- a/monero-wallet-gui.pro +++ b/monero-wallet-gui.pro @@ -217,9 +217,9 @@ linux { message("using static libraries") LIBS+= -Wl,-Bstatic QMAKE_LFLAGS += -static-libgcc -static-libstdc++ - contains(QT_ARCH, x86_64) { + # contains(QT_ARCH, x86_64) { LIBS+= -lunbound - } + # } } else { # On some distro's we need to add dynload LIBS+= -ldl |