tiamak/monero_c
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 4 Wiki Activity

macos fixes

Browse Source
This commit is contained in:
Czarek Nakamoto
2024-05-27 10:25:54 +02:00
parent 72bae6b8c9
commit 4899bb9a09
3 changed files with 9 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
build_single.sh
View File

@@ -183,7 +183,7 @@ pushd $repo/contrib/depends
export HOMEBREW_PREFIX=/usr/local export HOMEBREW_PREFIX=/usr/local
fi fi
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 "${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 "../../../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 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 then
verbose_copy "${WOWNEROSEED_DIR}/libwownero-seed.a" ${MACOS_LIBS_DIR}/lib/libwownero-seed.a verbose_copy "${WOWNEROSEED_DIR}/libwownero-seed.a" ${MACOS_LIBS_DIR}/lib/libwownero-seed.a
fi fi
verbose_copy "${HOMEBREW_PREFIX}/lib/libevent.a" ${MACOS_LIBS_DIR}/lib/libevent.a
;; ;;
"host-apple-ios") "host-apple-ios")
echo "====================================" 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" ../.. 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") "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") "host-apple-ios")
PREFIX="$(realpath "${PWD}/../../../external/ios/build/ios")" PREFIX="$(realpath "${PWD}/../../../external/ios/build/ios")"

8
external/macos/build_unbound.sh vendored
View File

@@ -3,13 +3,6 @@ set -x -e
. config.sh . 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
EXPAT_VERSION=R_2_4_8 EXPAT_VERSION=R_2_4_8
@@ -40,6 +33,7 @@ cd $UNBOUND_DIR_PATH
test `git rev-parse HEAD` = ${UNBOUND_HASH} || exit 1 test `git rev-parse HEAD` = ${UNBOUND_HASH} || exit 1
./configure --prefix="${EXTERNAL_MACOS_DIR}" \ ./configure --prefix="${EXTERNAL_MACOS_DIR}" \
--with-ssl="${HOMEBREW_PREFIX}" \
--with-libexpat="${EXTERNAL_MACOS_DIR}" \ --with-libexpat="${EXTERNAL_MACOS_DIR}" \
--enable-static \ --enable-static \
--disable-shared \ --disable-shared \

6
monero_libwallet2_api_c/CMakeLists.txt
View File

@@ -291,10 +291,6 @@ add_library(hidapi STATIC IMPORTED)
set_target_properties(hidapi PROPERTIES IMPORTED_LOCATION set_target_properties(hidapi PROPERTIES IMPORTED_LOCATION
${EXTERNAL_LIBS_DIR}/lib/libhidapi.a) ${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 # 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 elseif(${HOST_ABI} STREQUAL "host-apple-darwin" OR
${HOST_ABI} STREQUAL "x86_64-host-apple-darwin" OR ${HOST_ABI} STREQUAL "x86_64-host-apple-darwin" OR
${HOST_ABI} STREQUAL "aarch64-host-apple-darwin") ${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") elseif(${HOST_ABI} STREQUAL "host-apple-ios")
set(EXTRA_LIBS_APPLE "-framework IOKit" "-framework CoreFoundation" iconv ) set(EXTRA_LIBS_APPLE "-framework IOKit" "-framework CoreFoundation" iconv )
endif() endif()