diff options
| -rwxr-xr-x | build_single.sh | 9 | ||||
| -rwxr-xr-x | external/macos/build_unbound.sh | 10 | ||||
| -rw-r--r-- | monero_libwallet2_api_c/CMakeLists.txt | 6 |
3 files changed, 9 insertions, 16 deletions
diff --git a/build_single.sh b/build_single.sh index f72e04d..9b0748b 100755 --- a/build_single.sh +++ b/build_single.sh @@ -183,7 +183,7 @@ pushd $repo/contrib/depends export HOMEBREW_PREFIX=/usr/local fi fi - # NOTE: we can use unbound from brew but app store rejects the app + # NOTE: we can use unbound from brew but app store rejects the app because of nghttp2 symbols being included # verbose_copy "${HOMEBREW_PREFIX}/lib/libunbound.a" ${MACOS_LIBS_DIR}/lib/libunbound.a verbose_copy "../../../external/macos/build/MACOS/lib/libunbound.a" ${MACOS_LIBS_DIR}/lib/libunbound.a verbose_copy "${HOMEBREW_PREFIX}/lib/libboost_chrono-mt.a" ${MACOS_LIBS_DIR}/lib/libboost_chrono-mt.a @@ -204,7 +204,6 @@ pushd $repo/contrib/depends then verbose_copy "${WOWNEROSEED_DIR}/libwownero-seed.a" ${MACOS_LIBS_DIR}/lib/libwownero-seed.a fi - verbose_copy "${HOMEBREW_PREFIX}/lib/libevent.a" ${MACOS_LIBS_DIR}/lib/libevent.a ;; "host-apple-ios") echo "====================================" @@ -318,7 +317,11 @@ pushd $repo/build/${HOST_ABI} env CC="${CC}" CXX="${CXX}" cmake -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_TOOLCHAIN_FILE=$PWD/../../contrib/depends/${HOST_ABI}/share/toolchain.cmake -D USE_DEVICE_TREZOR=OFF -D BUILD_GUI_DEPS=1 -D BUILD_TESTS=OFF -D STATIC=ON -D ARCH="armv8-a" -D BUILD_64=ON -D CMAKE_BUILD_TYPE=$buildType -D BUILD_TAG="mac-armv8" ../.. ;; "host-apple-darwin" | "x86_64-host-apple-darwin" | "aarch64-host-apple-darwin") - env CC="${CC}" CXX="${CXX}" cmake -DCMAKE_POSITION_INDEPENDENT_CODE=ON -D USE_DEVICE_TREZOR=OFF -D BUILD_GUI_DEPS=1 -D BUILD_TESTS=OFF -D STATIC=ON -D BUILD_64=ON -D CMAKE_BUILD_TYPE=$buildType ../.. + PREFIX="$(realpath "${PWD}/../../../external/macos/build/MACOS")" + env \ + CMAKE_INCLUDE_PATH="${PREFIX}/include" \ + CMAKE_LIBRARY_PATH="${PREFIX}/lib" \ + CC="${CC}" CXX="${CXX}" cmake -DCMAKE_POSITION_INDEPENDENT_CODE=ON -D USE_DEVICE_TREZOR=OFF -D BUILD_GUI_DEPS=1 -D BUILD_TESTS=OFF -D STATIC=ON -D BUILD_64=ON -D CMAKE_BUILD_TYPE=$buildType ../.. ;; "host-apple-ios") PREFIX="$(realpath "${PWD}/../../../external/ios/build/ios")" diff --git a/external/macos/build_unbound.sh b/external/macos/build_unbound.sh index 24ed54f..e9e1ff8 100755 --- a/external/macos/build_unbound.sh +++ b/external/macos/build_unbound.sh @@ -3,13 +3,6 @@ set -x -e . config.sh -#### add m4 to path -# NOTE: this may not be needed. - -HOMEBREW_PREFIX="$(brew config | grep HOMEBREW_PREFIX | awk '{ print $2 }')" -M4_VERSION="$(brew info m4 | head -1 | awk '{ print $4 }')" -export PATH="${HOMEBREW_PREFIX}/Cellar/m4/${M4_VERSION}/bin/:$PATH" - #### expat EXPAT_VERSION=R_2_4_8 @@ -40,9 +33,10 @@ cd $UNBOUND_DIR_PATH test `git rev-parse HEAD` = ${UNBOUND_HASH} || exit 1 ./configure --prefix="${EXTERNAL_MACOS_DIR}" \ + --with-ssl="${HOMEBREW_PREFIX}" \ --with-libexpat="${EXTERNAL_MACOS_DIR}" \ --enable-static \ --disable-shared \ --disable-flto make -make install
\ No newline at end of file +make install diff --git a/monero_libwallet2_api_c/CMakeLists.txt b/monero_libwallet2_api_c/CMakeLists.txt index 3efca54..2eaae56 100644 --- a/monero_libwallet2_api_c/CMakeLists.txt +++ b/monero_libwallet2_api_c/CMakeLists.txt @@ -291,10 +291,6 @@ add_library(hidapi STATIC IMPORTED) set_target_properties(hidapi PROPERTIES IMPORTED_LOCATION ${EXTERNAL_LIBS_DIR}/lib/libhidapi.a) -add_library(event STATIC IMPORTED) -set_target_properties(event PROPERTIES IMPORTED_LOCATION - ${EXTERNAL_LIBS_DIR}/lib/libevent.a) - ############# # System ############# @@ -327,7 +323,7 @@ if (${HOST_ABI} STREQUAL "x86_64-apple-darwin11" OR ${HOST_ABI} STREQUAL "aarch6 elseif(${HOST_ABI} STREQUAL "host-apple-darwin" OR ${HOST_ABI} STREQUAL "x86_64-host-apple-darwin" OR ${HOST_ABI} STREQUAL "aarch64-host-apple-darwin") - set(EXTRA_LIBS_APPLE "-framework IOKit" "-framework CoreFoundation" "-framework Cocoa" apple_nghttp2 event) + set(EXTRA_LIBS_APPLE "-framework IOKit" "-framework CoreFoundation" "-framework Cocoa" apple_nghttp2) elseif(${HOST_ABI} STREQUAL "host-apple-ios") set(EXTRA_LIBS_APPLE "-framework IOKit" "-framework CoreFoundation" iconv ) endif() |