From f74ef30ace6b45f3c0c29191d17aa1cbe48a6f2e Mon Sep 17 00:00:00 2001 From: Jaquee Date: Thu, 15 Dec 2016 18:01:06 +0100 Subject: [PATCH 1/2] Fix ubuntu build --- build.sh | 2 +- get_libwallet_api.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sh b/build.sh index f110fb02..bd32680c 100755 --- a/build.sh +++ b/build.sh @@ -30,7 +30,7 @@ fi # Platform indepenent settings platform=$(get_platform) -if [ "$platform" == "linux" ]; then +if [ "$platform" == "linux32" ] || [ "$platform" == "linux64" ]; then distro=$(lsb_release -is) if [ "$distro" == "Ubuntu" ]; then CONFIG="$CONFIG libunwind_off" diff --git a/get_libwallet_api.sh b/get_libwallet_api.sh index 9c5ef3f7..717b1f3a 100755 --- a/get_libwallet_api.sh +++ b/get_libwallet_api.sh @@ -96,7 +96,7 @@ fi # since filename conflict (random.c.obj) # for Linux, we use libunbound shipped with the system, so we don't need to build it -if [ "$platform" != "linux" ]; then +if [ "$platform" != "linux32" ] && [ "$platform" != "linux64" ]; then echo "Building libunbound..." pushd $MONERO_DIR/build/release/external/unbound # no need to make, it was already built as dependency for libwallet From e97a2115d95d3d33f7935402322047651725fe6f Mon Sep 17 00:00:00 2001 From: Jaquee Date: Thu, 15 Dec 2016 23:08:26 +0100 Subject: [PATCH 2/2] mac build: target x86-64 --- get_libwallet_api.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/get_libwallet_api.sh b/get_libwallet_api.sh index 717b1f3a..bf746cd3 100755 --- a/get_libwallet_api.sh +++ b/get_libwallet_api.sh @@ -49,7 +49,7 @@ make_exec="make" if [ "$platform" == "darwin" ]; then # Do something under Mac OS X platform echo "Configuring build for MacOS.." - cmake -D CMAKE_BUILD_TYPE=$BUILD_TYPE -D STATIC=ON -D BUILD_GUI_DEPS=ON -D INSTALL_VENDORED_LIBUNBOUND=ON -D CMAKE_INSTALL_PREFIX="$MONERO_DIR" ../.. + cmake -D CMAKE_BUILD_TYPE=$BUILD_TYPE -D STATIC=ON -D ARCH="x86-64" -D BUILD_64=ON -D BUILD_GUI_DEPS=ON -D INSTALL_VENDORED_LIBUNBOUND=ON -D CMAKE_INSTALL_PREFIX="$MONERO_DIR" ../.. elif [ "$platform" == "linux64" ]; then # Do something under GNU/Linux platform echo "Configuring build for Linux.."