mirror of
https://github.com/RPCS3/AppImageKit-checkrt.git
synced 2026-01-31 01:25:17 +01:00
52 lines
2.5 KiB
Diff
52 lines
2.5 KiB
Diff
--- a/AppRun.c
|
|
+++ b/AppRun.c
|
|
@@ -164,6 +164,9 @@
|
|
char *old_env;
|
|
size_t length;
|
|
const char *format;
|
|
+ checkrt(usr_in_appdir);
|
|
+ if (optional_ld_preload)
|
|
+ putenv(optional_ld_preload);
|
|
|
|
/* https://docs.python.org/2/using/cmdline.html#envvar-PYTHONHOME */
|
|
SET_NEW_ENV(new_pythonhome, appdir_s, "PYTHONHOME=%s/usr/", appdir);
|
|
@@ -171,8 +174,28 @@
|
|
old_env = getenv("PATH") ?: "";
|
|
SET_NEW_ENV(new_path, appdir_s*5 + strlen(old_env), "PATH=%s/usr/bin/:%s/usr/sbin/:%s/usr/games/:%s/bin/:%s/sbin/:%s", appdir, appdir, appdir, appdir, appdir, old_env);
|
|
|
|
+ int doUseBuiltinSTDCPP = 0;
|
|
+ FILE *fp = popen("/usr/bin/lsb_release -rcs 2>/dev/null", "r");
|
|
+ if (fp != NULL)
|
|
+ {
|
|
+ char version[1035];
|
|
+ fgets(version, sizeof(version), fp);
|
|
+ char codename[1035];
|
|
+ fgets(codename, sizeof(codename), fp);
|
|
+ if (strcmp(version, "14.04\n") == 0 && strcmp(codename, "trusty\n") == 0)
|
|
+ doUseBuiltinSTDCPP = 1;
|
|
+ else if (strcmp(version, "16.04\n") == 0 && strcmp(codename, "xenial\n") == 0)
|
|
+ doUseBuiltinSTDCPP = 1;
|
|
+ else if (strcmp(version, "18.3\n") == 0 && strcmp(codename, "sylvia\n") == 0)
|
|
+ doUseBuiltinSTDCPP = 1;
|
|
+
|
|
+ }
|
|
old_env = getenv("LD_LIBRARY_PATH") ?: "";
|
|
SET_NEW_ENV(new_ld_library_path, appdir_s*10 + strlen(old_env), "LD_LIBRARY_PATH=%s/usr/lib/:%s/usr/lib/i386-linux-gnu/:%s/usr/lib/x86_64-linux-gnu/:%s/usr/lib32/:%s/usr/lib64/:%s/lib/:%s/lib/i386-linux-gnu/:%s/lib/x86_64-linux-gnu/:%s/lib32/:%s/lib64/:%s", appdir, appdir, appdir, appdir, appdir, appdir, appdir, appdir, appdir, appdir, old_env);
|
|
+ if (doUseBuiltinSTDCPP)
|
|
+ {
|
|
+ SET_NEW_ENV(new_ld_library_path, strlen(optional_ld_library_path) + appdir_s*10 + strlen(old_env), "LD_LIBRARY_PATH=%s%s/usr/lib/:%s/usr/lib/i386-linux-gnu/:%s/usr/lib/x86_64-linux-gnu/:%s/usr/lib32/:%s/usr/lib64/:%s/lib/:%s/lib/i386-linux-gnu/:%s/lib/x86_64-linux-gnu/:%s/lib32/:%s/lib64/:%s", optional_ld_library_path, appdir, appdir, appdir, appdir, appdir, appdir, appdir, appdir, appdir, appdir, old_env);
|
|
+ }
|
|
|
|
old_env = getenv("PYTHONPATH") ?: "";
|
|
SET_NEW_ENV(new_pythonpath, appdir_s + strlen(old_env), "PYTHONPATH=%s/usr/share/pyshared/:%s", appdir, old_env);
|
|
@@ -201,6 +224,9 @@
|
|
if (ret == -1)
|
|
die("Error executing '%s': %s\n", exe, strerror(error));
|
|
|
|
+ free(optional_ld_library_path);
|
|
+ if (optional_ld_preload)
|
|
+ free(optional_ld_preload);
|
|
free(line);
|
|
free(desktop_file);
|
|
free(usr_in_appdir);
|