summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Golubev <fatzer2@gmail.com>2026-03-02 16:22:58 +0300
committerAlexander Golubev <fatzer2@gmail.com>2026-03-02 18:28:00 +0300
commitc134c62c382c7c8611e24d347ade5cd81d35b7e4 (patch)
treec251ca216b876ae98b3c68b2788f62d99140d8e5
parentc21034f87c78518e4f9d7a2d78f220f42263bd4c (diff)
downloadtde-packaging-gentoo-Fat-Zer/other/no-LD_LIBRARY_PATH.tar.gz
tde-packaging-gentoo-Fat-Zer/other/no-LD_LIBRARY_PATH.zip
trinity-functions-2.eclass: stop defining LD_LIBRARY_PATHFat-Zer/other/no-LD_LIBRARY_PATH
This were causing build failures on ABI/API change of tdelibs. It looks like the variable is not needed anymore (see #402). Closes: https://mirror.git.trinitydesktop.org/gitea/TDE/tde-packaging-gentoo/issues/402 Signed-off-by: Alexander Golubev <fatzer2@gmail.com> (cherry picked from commit 0067a0491328fd0097d5eb261beda6328d54cf5c)
-rw-r--r--eclass/trinity-functions-2.eclass8
1 files changed, 1 insertions, 7 deletions
diff --git a/eclass/trinity-functions-2.eclass b/eclass/trinity-functions-2.eclass
index 1d709242..d27b2be7 100644
--- a/eclass/trinity-functions-2.eclass
+++ b/eclass/trinity-functions-2.eclass
@@ -76,7 +76,7 @@ get-trinity-libdirs() {
# @FUNCTION: adjust-trinity-paths
# @USAGE: < version >
# @DESCRIPTION:
-# Adjusts PATH and LD_LIBRARY_PATH to see only current trinity version.
+# Adjusts PATH and other env vars to see only current trinity version.
adjust-trinity-paths() {
debug-print-function ${FUNCNAME} "${@}"
local libdir
@@ -86,13 +86,7 @@ adjust-trinity-paths() {
PATH="$(trinity_remove_path_component "${PATH}" "/usr/trinity/*/sbin")"
PATH="$(trinity_prepand_path_component "${PATH}" "${TDEDIR}/bin" )"
- LD_LIBRARY_PATH="$(trinity_remove_path_component "${LD_LIBRARY_PATH}" "/usr/trinity/*/${libdir}")"
- for libdir in $(get-trinity-libdirs); do
- LD_LIBRARY_PATH="$(trinity_prepand_path_component "${LD_LIBRARY_PATH}" "${libdir}" )"
- done
-
export PATH
- export LD_LIBRARY_PATH
# Unset home paths so applications wouldn't try to write to root's dir while building
unset TDEHOME