mirror of
https://github.com/oxen-io/oxen-core.git
synced 2023-12-14 02:22:56 +01:00
Android fixes
- fix openssl build on android with new openssl incantations needed with openssl 3.x - disable Werror on android
This commit is contained in:
parent
3cfbf0fb66
commit
7bc2a0aa7e
2 changed files with 7 additions and 4 deletions
|
@ -176,7 +176,7 @@ local android_build_steps(android_abi, android_platform=21, jobs=6, cmake_extra=
|
||||||
'-DCMAKE_BUILD_TYPE=Release ' +
|
'-DCMAKE_BUILD_TYPE=Release ' +
|
||||||
'-DCMAKE_TOOLCHAIN_FILE=/usr/lib/android-sdk/ndk-bundle/build/cmake/android.toolchain.cmake ' +
|
'-DCMAKE_TOOLCHAIN_FILE=/usr/lib/android-sdk/ndk-bundle/build/cmake/android.toolchain.cmake ' +
|
||||||
'-DANDROID_PLATFORM=' + android_platform + ' -DANDROID_ABI=' + android_abi + ' ' +
|
'-DANDROID_PLATFORM=' + android_platform + ' -DANDROID_ABI=' + android_abi + ' ' +
|
||||||
'-DMONERO_SLOW_HASH=ON ' +
|
cmake_options({ MONERO_SLOW_HASH: true, WARNINGS_AS_ERRORS: false, BUILD_TESTS: false }) +
|
||||||
'-DLOCAL_MIRROR=https://builds.lokinet.dev/deps ' +
|
'-DLOCAL_MIRROR=https://builds.lokinet.dev/deps ' +
|
||||||
'-DBUILD_STATIC_DEPS=ON -DSTATIC=ON -G Ninja ' + cmake_extra,
|
'-DBUILD_STATIC_DEPS=ON -DSTATIC=ON -G Ninja ' + cmake_extra,
|
||||||
'ninja -j' + jobs + ' -v wallet_merged',
|
'ninja -j' + jobs + ' -v wallet_merged',
|
||||||
|
|
|
@ -289,6 +289,8 @@ if(CMAKE_CROSSCOMPILING)
|
||||||
elseif(ANDROID)
|
elseif(ANDROID)
|
||||||
set(openssl_configure_extra ${openssl_machine} -D__ANDROID_API__=21)
|
set(openssl_configure_extra ${openssl_machine} -D__ANDROID_API__=21)
|
||||||
set(openssl_system_env ${cross_extra})
|
set(openssl_system_env ${cross_extra})
|
||||||
|
list(APPEND openssl_system_env "ANDROID_NDK_ROOT=${ANDROID_NDK}")
|
||||||
|
list(APPEND openssl_system_env "PATH=${ANDROID_TOOLCHAIN_ROOT}/bin:${ANDROID_NDK}/toolchains/${ANDROID_TOOLCHAIN_NAME}/prebuilt/linux-x86_64/bin:$ENV{PATH}")
|
||||||
set(openssl_extra_opts no-asm)
|
set(openssl_extra_opts no-asm)
|
||||||
elseif(IOS)
|
elseif(IOS)
|
||||||
get_filename_component(apple_toolchain "${CMAKE_C_COMPILER}" DIRECTORY)
|
get_filename_component(apple_toolchain "${CMAKE_C_COMPILER}" DIRECTORY)
|
||||||
|
@ -302,11 +304,12 @@ if(CMAKE_CROSSCOMPILING)
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
build_external(openssl
|
build_external(openssl
|
||||||
CONFIGURE_COMMAND ${CMAKE_COMMAND} -E env CC=${openssl_cc} ${openssl_system_env} ./Configure ${openssl_configure_extra}
|
CONFIGURE_COMMAND ${CMAKE_COMMAND} -E env CC=${openssl_cc} "CFLAGS=${deps_CFLAGS}" ${openssl_system_env}
|
||||||
--prefix=${DEPS_DESTDIR} --libdir=lib ${openssl_extra_opts}
|
./Configure ${openssl_configure_extra} --prefix=${DEPS_DESTDIR} --libdir=lib ${openssl_extra_opts}
|
||||||
no-shared no-capieng no-dso no-dtls1 no-ec_nistp_64_gcc_128 no-gost
|
no-shared no-capieng no-dso no-dtls1 no-ec_nistp_64_gcc_128 no-gost
|
||||||
no-md2 no-rc5 no-rdrand no-rfc3779 no-sctp no-ssl-trace no-ssl3
|
no-md2 no-rc5 no-rdrand no-rfc3779 no-sctp no-ssl-trace no-ssl3
|
||||||
no-static-engine no-tests no-weak-ssl-ciphers no-zlib-dynamic "CFLAGS=${deps_CFLAGS}"
|
no-static-engine no-tests no-weak-ssl-ciphers no-zlib-dynamic
|
||||||
|
BUILD_COMMAND ${CMAKE_COMMAND} -E env CC=${openssl_cc} ${openssl_system_env} make
|
||||||
INSTALL_COMMAND make install_sw
|
INSTALL_COMMAND make install_sw
|
||||||
BUILD_BYPRODUCTS
|
BUILD_BYPRODUCTS
|
||||||
${DEPS_DESTDIR}/lib/libssl.a ${DEPS_DESTDIR}/lib/libcrypto.a
|
${DEPS_DESTDIR}/lib/libssl.a ${DEPS_DESTDIR}/lib/libcrypto.a
|
||||||
|
|
Loading…
Reference in a new issue