From b34a50b38160d8455763773888130ecc4e18042a Mon Sep 17 00:00:00 2001 From: Yang Liu Date: Wed, 4 Sep 2024 20:13:58 +0800 Subject: [X64LIBS] Changed x86/x64 libs install directory to prevent conflicts (#1791) * [X64LIBS] Changed x86/x64 libs install directory to prevent conflicts * Update pressure_vessel --- src/core.c | 4 ++++ src/steam.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/core.c b/src/core.c index 2fda5c2e..188102a1 100644 --- a/src/core.c +++ b/src/core.c @@ -1505,6 +1505,8 @@ void LoadLDPath(box64context_t *context) AddPath("/usr/lib/i386-linux-gnu", &context->box64_ld_lib, 1); if(FileExist("/usr/i386-linux-gnu/lib", 0)) AddPath("/usr/i386-linux-gnu/lib", &context->box64_ld_lib, 1); + if(FileExist("/usr/lib/box64-i386-linux-gnu", 0)) + AddPath("/usr/lib/box64-i386-linux-gnu", &context->box64_ld_lib, 1); if(FileExist("/data/data/com.termux/files/usr/glibc/lib/i386-linux-gnu", 0)) AddPath("/data/data/com.termux/files/usr/glibc/lib/i386-linux-gnu", &context->box64_ld_lib, 1); #endif @@ -1515,6 +1517,8 @@ void LoadLDPath(box64context_t *context) AddPath("/usr/lib/x86_64-linux-gnu", &context->box64_ld_lib, 1); if(FileExist("/usr/x86_64-linux-gnu/lib", 0)) AddPath("/usr/x86_64-linux-gnu/lib", &context->box64_ld_lib, 1); + if(FileExist("/usr/lib/box64-x86_64-linux-gnu", 0)) + AddPath("/usr/lib/box64-x86_64-linux-gnu", &context->box64_ld_lib, 1); if(FileExist("/data/data/com.termux/files/usr/glibc/lib/x86_64-linux-gnu", 0)) AddPath("/data/data/com.termux/files/usr/glibc/lib/x86_64-linux-gnu", &context->box64_ld_lib, 1); } diff --git a/src/steam.c b/src/steam.c index 52461a31..8859ce05 100644 --- a/src/steam.c +++ b/src/steam.c @@ -39,13 +39,13 @@ void pressure_vessel(int argc, const char** argv, int nextarg, const char* prog) if(is_usr) { // transform RESSURE_VESSEL_APP_LD_LIBRARY_PATH to BOX86_ / BOX64_ LD_LIBRARY_PATH char tmp[strlen(argv[nextarg])+150]; - strcpy(tmp, "BOX86_LD_LIBRARY_PATH=/lib/box86:/usr/lib/box86:/lib/i386-linux-gnu:/usr/lib/i386-linux-gnu:/usr/lib/i686-pc-linux-gnu:/usr/lib32:"); + strcpy(tmp, "BOX86_LD_LIBRARY_PATH=/lib/box86:/usr/lib/box86:/lib/i386-linux-gnu:/usr/lib/i386-linux-gnu:/usr/lib/box64-i386-linux-gnu:/usr/lib/i686-pc-linux-gnu:/usr/lib32:"); strcat(tmp, argv[nextarg]+strlen("--env-if-host=STEAM_RUNTIME_LIBRARY_PATH=")); char *p = strchr(tmp, '='); *p ='\0'; ++p; setenv(tmp, p, 1); printf_log(LOG_DEBUG, "setenv(%s, %s, 1)\n", tmp, p); - strcpy(tmp, "BOX64_LD_LIBRARY_PATH=/lib/x86_64-linux-gnu:/usr/lib/x86_64-linux-gnu:"); + strcpy(tmp, "BOX64_LD_LIBRARY_PATH=/lib/x86_64-linux-gnu:/usr/lib/x86_64-linux-gnu:/usr/lib/box64-x86_64-linux-gnu:"); strcat(tmp, argv[nextarg]+strlen("--env-if-host=STEAM_RUNTIME_LIBRARY_PATH=")); p = strchr(tmp, '='); *p ='\0'; ++p; -- cgit 1.4.1