The_Great_Archive/libretroshare
1
0
Fork 0
mirror of https://github.com/RetroShare/libretroshare.git synced 2026-09-12 19:50:03 +05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #376 from jolavillette/fix/android-rnp-probe-libdl

Browse Source 
Android: link libdl into rnp's OpenSSL feature probe
This commit is contained in:
Gioacchino Mazzurco 2026-08-30 10:50:52 +02:00 committed by GitHub
commit c4c2374d73
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
misc/Android/prepare-toolchain-clang.sh
View File

@ -889,6 +889,24 @@ endif(CMAKE_CROSSCOMPILING_EMULATOR)' \
"${S_dir}/cmake/Modules/FindOpenSSLFeatures.cmake"
}
# The feature probe is linked statically, and OpenSSL 1.1.1 libcrypto.a
# pulls in dso_dlfcn.o which references dlopen/dlsym/dlclose/dlerror.
# CMake's FindOpenSSL does not put ${CMAKE_DL_LIBS} in the OpenSSL::Crypto
# interface here, so nothing provides them and the link dies with
#
# ld.lld: error: undefined symbol: dlopen
# >>> referenced by dso_dlfcn.c
# >>> dso_dlfcn.o:(dlfcn_load) in archive .../libcrypto.a
#
# The NDK ships a static libdl.a defining those symbols, so link it
# explicitly, as a linked library rather than CMAKE_EXE_LINKER_FLAGS so
# it is ordered after libcrypto.a for linkers that resolve archives in a
# single pass (lld does not care, GNU ld does).
# Submitted upstream as rnpgp/rnp#2473; drop this sed once it is in.
sed -i \
's|(findopensslfeatures PRIVATE OpenSSL::Crypto)|(findopensslfeatures PRIVATE OpenSSL::Crypto dl)|' \
"${S_dir}/cmake/Modules/FindOpenSSLFeatures.cmake"
rm -rf "$B_dir"; mkdir "$B_dir"
pushd "$B_dir" || return $?
# CRYPTO_BACKEND use openssl on which we already depends instead of default