fastfetch-cli/fastfetch
1
0
Fork 0
mirror of https://github.com/fastfetch-cli/fastfetch.git synced 2026-10-27 23:30:47 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

Android: fixes binaries built via NDK running on Termux

Browse Source
This commit is contained in:
Carter Li
2026-10-07 14:29:42 +08:00
parent 9859b248ff
commit 35a35f066c
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+6 -2
View File
@@ -1550,11 +1550,15 @@ if(APPLE AND BINARY_LINK_TYPE STREQUAL "dlopen")
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-rpath,/opt/homebrew/lib -Wl,-rpath,/usr/local/lib -Wl,-rpath,/opt/local/lib") set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-rpath,/opt/homebrew/lib -Wl,-rpath,/usr/local/lib -Wl,-rpath,/opt/local/lib")
endif() endif()
# Termux installs the libraries fastfetch dlopens -- freetype among them -- under TARGET_DIR_ROOT, which
# is not on the Android linker's default search path (DT_RUNPATH, LD_LIBRARY_PATH and the default
# namespace). Termux's own clang injects -rpath=$PREFIX/lib into every binary it links, so a build made
# inside Termux finds them; a plain NDK build, which is what the CI does, does not.
if(ANDROID) if(ANDROID)
if(CMAKE_SIZEOF_VOID_P EQUAL 8) if(CMAKE_SIZEOF_VOID_P EQUAL 8)
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-rpath,/vendor/lib64 -Wl,-rpath,/system/lib64") set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-rpath,${TARGET_DIR_ROOT}/lib -Wl,-rpath,/vendor/lib64 -Wl,-rpath,/system/lib64")
else() else()
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-rpath,/vendor/lib -Wl,-rpath,/system/lib") set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-rpath,${TARGET_DIR_ROOT}/lib -Wl,-rpath,/vendor/lib -Wl,-rpath,/system/lib")
endif() endif()
endif() endif()
src/common/impl/FFPlatform_unix.c
+5
View File
@@ -333,7 +333,12 @@ static void getCwd(FFPlatform* platform) {
void ffPlatformInitImpl(FFPlatform* platform) { void ffPlatformInitImpl(FFPlatform* platform) {
platform->pid = (uint32_t) getpid(); platform->pid = (uint32_t) getpid();
platform->uid = getuid(); platform->uid = getuid();
#if !__ANDROID__
struct passwd* pwd = getpwuid(platform->uid); struct passwd* pwd = getpwuid(platform->uid);
#else
// On Android, /etc/passwd is empty, and getpwuid() will return `/data` for pw_dir
struct passwd* pwd = nullptr;
#endif
struct utsname uts; struct utsname uts;
if (uname(&uts) < 0) { if (uname(&uts) < 0) {