84 lines
1.7 KiB
Diff
84 lines
1.7 KiB
Diff
From aad72cc9d7d9788daef801ad95d4ce5e873d2b76 Mon Sep 17 00:00:00 2001
|
|
From: starlet-dx <15929766099@163.com>
|
|
Date: Mon, 14 Mar 2022 15:01:27 +0800
|
|
Subject: [PATCH 1/1] festival-no-LD_LIBRARY_PATH-extension
|
|
|
|
---
|
|
src/scripts/shared_script | 19 -------------------
|
|
src/scripts/shared_setup_prl | 8 --------
|
|
src/scripts/shared_setup_sh | 18 ------------------
|
|
3 files changed, 45 deletions(-)
|
|
|
|
diff --git a/src/scripts/shared_script b/src/scripts/shared_script
|
|
index 736034d..5c17b7e 100644
|
|
--- a/src/scripts/shared_script
|
|
+++ b/src/scripts/shared_script
|
|
@@ -1,24 +1,5 @@
|
|
#!/bin/sh
|
|
|
|
-# Festival shared script
|
|
-
|
|
-extend() {
|
|
- var="$1"
|
|
- extra="$2"
|
|
- eval "val=\$$var"
|
|
-
|
|
- if [ -n "$val" ]
|
|
- then
|
|
- val="$extra:$val"
|
|
- else
|
|
- val="$extra"
|
|
- fi
|
|
- eval "$var='$val'"
|
|
- eval "export $var"
|
|
- }
|
|
-
|
|
-extend LD_LIBRARY_PATH "__EST__/lib:__LDPATH__"
|
|
-
|
|
exec __MAIN__/__PROGRAM__ "$@"
|
|
|
|
exit 0
|
|
diff --git a/src/scripts/shared_setup_prl b/src/scripts/shared_setup_prl
|
|
index eba11ff..139597f 100644
|
|
--- a/src/scripts/shared_setup_prl
|
|
+++ b/src/scripts/shared_setup_prl
|
|
@@ -1,10 +1,2 @@
|
|
|
|
-if (defined($ENV{LD_LIBRARY_PATH}))
|
|
- {
|
|
- $ENV{LD_LIBRARY_PATH} = "__TOP__/lib:__LDPATH__:$ENV{LD_LIBRARY_PATH}";
|
|
- }
|
|
-else
|
|
- {
|
|
- $ENV{LD_LIBRARY_PATH} = "__TOP__/lib";
|
|
- }
|
|
|
|
diff --git a/src/scripts/shared_setup_sh b/src/scripts/shared_setup_sh
|
|
index ae45097..139597f 100644
|
|
--- a/src/scripts/shared_setup_sh
|
|
+++ b/src/scripts/shared_setup_sh
|
|
@@ -1,20 +1,2 @@
|
|
|
|
-# festival shared setup
|
|
-
|
|
-extend() {
|
|
- var="$1"
|
|
- extra="$2"
|
|
- eval "val=\$$var"
|
|
-
|
|
- if [ -n "$val" ]
|
|
- then
|
|
- val="$extra:$val"
|
|
- else
|
|
- val="$extra"
|
|
- fi
|
|
- eval "$var='$val'"
|
|
- eval "export $var"
|
|
- }
|
|
-
|
|
-extend LD_LIBRARY_PATH "__EST__/lib:__LDPATH__"
|
|
|
|
--
|
|
2.30.0
|
|
|