<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-base.

</pre>
<p><a href="https://github.com/macports/macports-base/commit/51a9cbccf95e6cf618f165be8ae6f565ee9efefb">https://github.com/macports/macports-base/commit/51a9cbccf95e6cf618f165be8ae6f565ee9efefb</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'>     new 51a9cbccf Avoid DYLD_LIBRARY_PATH for in-tree tclsh
</span>51a9cbccf is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 51a9cbccf95e6cf618f165be8ae6f565ee9efefb
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Sat Feb 15 10:32:50 2025 +1100

<span style='display:block; white-space:pre;color:#404040;'>    Avoid DYLD_LIBRARY_PATH for in-tree tclsh
</span>---
 vendor/Makefile.in |  3 +++
 vendor/tclsh.in    | 10 +++-------
 2 files changed, 6 insertions(+), 7 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/vendor/Makefile.in b/vendor/Makefile.in
</span><span style='display:block; white-space:pre;color:#808080;'>index a61e15435..9a4b3fc03 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/vendor/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/vendor/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -64,6 +64,9 @@ destroot: $(DESTROOT_TARGETS)
</span> destroot-tcl: all-tcl
        @echo ===\> staging to destroot in ${DIRPRFX}@VENDOR_TCL_SUBDIR@
        @umask 0022; $(MAKE) -C @VENDOR_TCL_SUBDIR@ "DESTDIR=${DESTROOT}" @VENDOR_TCL_INSTALL@
<span style='display:block; white-space:pre;background:#e0ffe0;'>+        [ "@OS_PLATFORM@" != darwin ] || install_name_tool -change "$(MP_PREFIX)/lib/libtcl@TCL_VERSION@.dylib" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+       "@executable_path/../lib/libtcl@TCL_VERSION@.dylib" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+       "$(DESTROOT)$(MP_PREFIX)/bin/tclsh@TCL_VERSION@"
</span> 
 destroot-tclx: all-tclx
        @echo ===\> staging to destroot in ${DIRPRFX}@VENDOR_TCLX_SUBDIR@
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/vendor/tclsh.in b/vendor/tclsh.in
</span><span style='display:block; white-space:pre;color:#808080;'>index a88adfe47..61bddf5fe 100755
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/vendor/tclsh.in
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/vendor/tclsh.in
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,19 +4,15 @@ DESTROOT="@abs_top_builddir@/vendor/vendor-destroot"
</span> MP_PREFIX="@prefix@/libexec/macports"
 LIB_PATH="${DESTROOT}${MP_PREFIX}/lib:${DESTROOT}${MP_PREFIX}/lib/@SQLITE3_LIBNAME@"
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# For macOS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if [ -z "$DYLD_LIBRARY_PATH" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    export DYLD_LIBRARY_PATH="$LIB_PATH"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    export DYLD_LIBRARY_PATH="$LIB_PATH:$DYLD_LIBRARY_PATH"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # For Linux and *BSD
 if [ -z "$LD_LIBRARY_PATH" ]; then
     export LD_LIBRARY_PATH="$LIB_PATH"
 else
     export LD_LIBRARY_PATH="$LIB_PATH:$LD_LIBRARY_PATH"
 fi
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# DYLD_LIBRARY_PATH tends to get lost on recent macOS due to basic
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# tools like /bin/sh being subject to SIP, so we have to edit the load
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# commands instead (see vendor/Makefile.in).
</span> 
 export TCLLIBPATH="${DESTROOT}${MP_PREFIX}/lib"
 
</pre><pre style='margin:0'>

</pre>