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 #373 from jolavillette/fix/android-rnp-double-emulator

Browse Source 
Android: skip the rnp cross-compile patch when upstream already has it
This commit is contained in:
Gioacchino Mazzurco 2026-08-30 09:13:48 +02:00 committed by GitHub
commit 77cd0e2e37
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -859,8 +859,18 @@ build_librnp()
# 3. Add -static linking via MKF so the binary doesn't need the Android
# dynamic linker which is unavailable on the host even via qemu
# 4. Remove quotes around FOF so CMake expands the list correctly
# TODO: remove when upstream patches are accepted
#
# Skip the patch when the checkout already handles the emulator on its own:
# rnp got this upstream (rnpgp/rnp 0a0672af, merged 2026-07-31) and
# LIBRNP_SOURCE_VERSION tracks origin/main, so patching on top of it
# prepends the emulator twice and the probe becomes
# "qemu-aarch64 /usr/bin/qemu-aarch64 build/findopensslfeatures", which
# fails with "Invalid ELF image for this architecture".
# TODO: drop the whole block once no supported rnp version needs it
#
grep -q CMAKE_CROSSCOMPILING_EMULATOR \
"${S_dir}/cmake/Modules/FindOpenSSLFeatures.cmake" ||
{
sed -i '/foreach(feature "hashes"/i\
if(CMAKE_CROSSCOMPILING_EMULATOR)\
set(FOF ${CMAKE_CROSSCOMPILING_EMULATOR} ${FOF})\
@ -877,6 +887,7 @@ endif(CMAKE_CROSSCOMPILING_EMULATOR)' \
sed -i 's|COMMAND "${FOF}" "${feature}"|COMMAND ${FOF} "${feature}"|' \
"${S_dir}/cmake/Modules/FindOpenSSLFeatures.cmake"
}
rm -rf "$B_dir"; mkdir "$B_dir"
pushd "$B_dir" || return $?