<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/89ab095ab77154578aac58cf3db27bc0c0c97f86">https://github.com/macports/macports-base/commit/89ab095ab77154578aac58cf3db27bc0c0c97f86</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 89ab095ab Use relative load path for libsqlite3 too
</span>89ab095ab is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 89ab095ab77154578aac58cf3db27bc0c0c97f86
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Sat Feb 15 11:22:44 2025 +1100
<span style='display:block; white-space:pre;color:#404040;'> Use relative load path for libsqlite3 too
</span>---
Mk/macports.autoconf.mk.in | 2 +-
vendor/Makefile.in | 36 +++++++++++++---------------
vendor/patches/tcl/sqlite-extern.patch | 2 +-
vendor/tcl8.6.16/pkgs/sqlite3.47.2/configure | 2 +-
4 files changed, 20 insertions(+), 22 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/Mk/macports.autoconf.mk.in b/Mk/macports.autoconf.mk.in
</span><span style='display:block; white-space:pre;color:#808080;'>index 29cbeaa2b..2b76c8c75 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/Mk/macports.autoconf.mk.in
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/Mk/macports.autoconf.mk.in
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,7 +27,7 @@ TCL_STUB_LIB_SPEC = @TCL_STUB_LIB_SPEC@
</span> LIBS = @LIBS@
READLINE_LIBS = @READLINE_LIBS@
MD5_LIBS = @MD5_LIBS@
<span style='display:block; white-space:pre;background:#ffe0e0;'>-SQLITE3_LIBS = @TCL_BIN_DIR@/pkgs/@SQLITE3_LIBNAME@/lib@SQLITE3_LIBNAME@$(SHLIB_SUFFIX)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+SQLITE3_LIBS = @abs_top_builddir@/@VENDOR_DESTROOT@@TCL_PREFIX@/lib/@SQLITE3_LIBNAME@/lib@SQLITE3_LIBNAME@$(SHLIB_SUFFIX)
</span> CURL_LIBS = @LDFLAGS_LIBCURL@
INSTALL = @INSTALL@
MTREE = @MTREE@
<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 9a4b3fc03..e9901dce0 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;'>@@ -5,9 +5,8 @@ CRITCL_SUBDIR= critcl
</span> SIGNIFY_SUBDIR= signify-osx
INSTALL_SUBDIR= install
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PREFIX= @prefix@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-DESTROOT= @abs_top_builddir@/vendor/vendor-destroot
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-MP_PREFIX= @prefix@/libexec/macports
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+DESTROOT= @abs_top_builddir@/@VENDOR_DESTROOT@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+TCL_PREFIX= @TCL_PREFIX@
</span>
.PHONY: all clean distclean install destroot test
.PHONY: destroot-tcl destroot-critcl destroot-tclx destroot-tcllib destroot-tcllibc destroot-signify destroot-install
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -64,9 +63,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:#ffe0e0;'>- [ "@OS_PLATFORM@" != darwin ] || install_name_tool -change "$(MP_PREFIX)/lib/libtcl@TCL_VERSION@.dylib" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [ "@OS_PLATFORM@" != darwin ] || install_name_tool -change "$(TCL_PREFIX)/lib/libtcl@TCL_VERSION@.dylib" \
</span> "@executable_path/../lib/libtcl@TCL_VERSION@.dylib" \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "$(DESTROOT)$(MP_PREFIX)/bin/tclsh@TCL_VERSION@"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "$(DESTROOT)$(TCL_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;background:#e0e0e0;'>@@ -76,27 +75,27 @@ destroot-tclx: all-tclx
</span> destroot-tcllib: destroot-tcl
@echo ===\> staging to destroot in ${DIRPRFX}@VENDOR_TCLLIB_SUBDIR@
@umask 0022; $(MAKE) -C @VENDOR_TCLLIB_SUBDIR@ "DESTDIR=${DESTROOT}" TCLSH_PROG=@INTREE_TCLSH@ @VENDOR_TCLLIB_INSTALL@
<span style='display:block; white-space:pre;background:#ffe0e0;'>- @chmod -R ugo+rX $(DESTROOT)$(MP_PREFIX)/lib/tcllib*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @chmod -R ugo+rX $(DESTROOT)$(TCL_PREFIX)/lib/tcllib*
</span>
.stamp-critcl: $(CRITCL_SUBDIR)/lib/critcl/critcl.tcl | destroot-tcl
@echo ===\> staging to destroot in ${DIRPRFX}${CRITCL_SUBDIR}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- @umask 0022; cd $(CRITCL_SUBDIR) && /usr/bin/env "HOME=@abs_top_builddir@/vendor" "@INTREE_TCLSH@" ./build.tcl install --prefix "$(MP_PREFIX)" --dest-dir "$(DESTROOT)" $(CRITCL_TARGET)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @chmod -R ugo+rX $(DESTROOT)$(MP_PREFIX)/lib/critcl*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @umask 0022; cd $(CRITCL_SUBDIR) && /usr/bin/env "HOME=@abs_top_builddir@/vendor" "@INTREE_TCLSH@" ./build.tcl install --prefix "$(TCL_PREFIX)" --dest-dir "$(DESTROOT)" $(CRITCL_TARGET)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @chmod -R ugo+rX $(DESTROOT)$(TCL_PREFIX)/lib/critcl*
</span> @touch .stamp-critcl
destroot-critcl: .stamp-critcl
.stamp-tcllibc: $(TCLLIB_SUBDIR)/support/installation/version.tcl .stamp-critcl
@echo ===\> staging tcllibc to destroot in ${DIRPRFX}@VENDOR_TCLLIB_SUBDIR@
<span style='display:block; white-space:pre;background:#ffe0e0;'>- @umask 0022; /usr/bin/env "PATH=$(DESTROOT)$(MP_PREFIX)/bin:$$PATH" $(MAKE) -C @VENDOR_TCLLIB_SUBDIR@ "DESTDIR=$(DESTROOT)" "CRITCL_TARGET=$(CRITCL_TARGET)" TCLSH_PROG=@INTREE_TCLSH@ install-binaries
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @chmod -R ugo+rX $(DESTROOT)$(MP_PREFIX)/lib/tcllib*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @umask 0022; /usr/bin/env "PATH=$(DESTROOT)$(TCL_PREFIX)/bin:$$PATH" $(MAKE) -C @VENDOR_TCLLIB_SUBDIR@ "DESTDIR=$(DESTROOT)" "CRITCL_TARGET=$(CRITCL_TARGET)" TCLSH_PROG=@INTREE_TCLSH@ install-binaries
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @chmod -R ugo+rX $(DESTROOT)$(TCL_PREFIX)/lib/tcllib*
</span> @touch .stamp-tcllibc
destroot-tcllibc: .stamp-tcllibc
destroot-signify:
@echo ===\> staging to destroot in ${DIRPRFX}${SIGNIFY_SUBDIR}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- @umask 0022; $(MAKE) -C $(SIGNIFY_SUBDIR) install "PREFIX=$(DESTROOT)$(MP_PREFIX)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @umask 0022; $(MAKE) -C $(SIGNIFY_SUBDIR) install "PREFIX=$(DESTROOT)$(TCL_PREFIX)"
</span>
destroot-install: all-install
@echo ===\> staging to destroot in ${DIRPRFX}${INSTALL_SUBDIR}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -115,7 +114,6 @@ endif
</span> install: $(INSTALL_TARGETS)
TCL_PACKAGE_PATH=@TCL_PACKAGE_PATH@
<span style='display:block; white-space:pre;background:#ffe0e0;'>-TCL_PREFIX=@TCL_PREFIX@
</span> OLD_TCL_FILES= $(DESTDIR)$(TCL_PACKAGE_PATH)/tcl8/8.4/http-2.7.1{2,3}.tm \
$(DESTDIR)$(TCL_PACKAGE_PATH)/tcl8/8.6/http-2.9.5.tm \
$(DESTDIR)$(TCL_PACKAGE_PATH)/tcl8/8.4/platform-1.0.1{2,3,4,8}.tm \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -151,22 +149,22 @@ install-tcllib:
</span> rm -rf $(DESTDIR)$(TCL_PACKAGE_PATH)/tcllib1.*
@echo ===\> making $(@:%-tcllib=%) in ${DIRPRFX}@VENDOR_TCLLIB_SUBDIR@
@umask 0022; $(MAKE) -C @VENDOR_TCLLIB_SUBDIR@ TCLSH_PROG=@INTREE_TCLSH@ @VENDOR_TCLLIB_INSTALL@
<span style='display:block; white-space:pre;background:#ffe0e0;'>- @chmod -R ugo+rX $(DESTDIR)$(MP_PREFIX)/lib/tcllib*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @chmod -R ugo+rX $(DESTDIR)$(TCL_PREFIX)/lib/tcllib*
</span>
install-tcllibc:
@echo ===\> making $(@:%-tcllibc=%)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- @umask 0022; cd "$(DESTROOT)$(MP_PREFIX)/lib"; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @umask 0022; cd "$(DESTROOT)$(TCL_PREFIX)/lib"; \
</span> for d in $$(find tcllibc* -type d); do \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- mkdir -p "$(DESTDIR)$(MP_PREFIX)/lib/$$d"; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mkdir -p "$(DESTDIR)$(TCL_PREFIX)/lib/$$d"; \
</span> done; \
for f in $$(find tcllibc* -type f); do \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- $(CPCMD) "$$f" "$(DESTDIR)$(MP_PREFIX)/lib/$$f"; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(CPCMD) "$$f" "$(DESTDIR)$(TCL_PREFIX)/lib/$$f"; \
</span> done
<span style='display:block; white-space:pre;background:#ffe0e0;'>- @chmod -R ugo+rX $(DESTDIR)$(MP_PREFIX)/lib/tcllibc*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @chmod -R ugo+rX $(DESTDIR)$(TCL_PREFIX)/lib/tcllibc*
</span>
install-signify:
@echo ===\> making $(@:%-signify=%) in ${DIRPRFX}${SIGNIFY_SUBDIR}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- @umask 0022; $(MAKE) -C $(SIGNIFY_SUBDIR) install "PREFIX=$(DESTDIR)$(MP_PREFIX)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @umask 0022; $(MAKE) -C $(SIGNIFY_SUBDIR) install "PREFIX=$(DESTDIR)$(TCL_PREFIX)"
</span>
install-install:
@echo ===\> making $(@:%-install=%) in ${DIRPRFX}${INSTALL_SUBDIR}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -186,6 +184,6 @@ distclean: $(DISTCLEAN_TARGETS)
</span> rm -f Makefile
rm -f tclsh
<span style='display:block; white-space:pre;background:#ffe0e0;'>-codesign:: signify-osx/signify tcl/unix/libtcl[89]*.dylib tcl/unix/tclsh tclx/libtclx[89]*.dylib tcl/unix/pkgs/itcl*/libitcl*.dylib tcl/unix/pkgs/tdbc[0-9]*/libtdbc*.dylib tcl/unix/pkgs/tdbcpostgres*/libtdbcpostgres*.dylib tcl/unix/pkgs/thread*/libthread*.dylib tcl/unix/pkgs/tdbcmysql*/libtdbcmysql*.dylib tcl/unix/pkgs/tdbcodbc*/libtdbcodbc*.dylib tcl/unix/pkgs/sqlite3*/libsqlite3*.dylib $(DESTROOT)$(MP_PREFIX)/lib/tcllibc*/macosx-macports/tcllibc.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+codesign:: signify-osx/signify tcl/unix/libtcl[89]*.dylib tcl/unix/tclsh tclx/libtclx[89]*.dylib tcl/unix/pkgs/itcl*/libitcl*.dylib tcl/unix/pkgs/tdbc[0-9]*/libtdbc*.dylib tcl/unix/pkgs/tdbcpostgres*/libtdbcpostgres*.dylib tcl/unix/pkgs/thread*/libthread*.dylib tcl/unix/pkgs/tdbcmysql*/libtdbcmysql*.dylib tcl/unix/pkgs/tdbcodbc*/libtdbcodbc*.dylib tcl/unix/pkgs/sqlite3*/libsqlite3*.dylib $(DESTROOT)$(TCL_PREFIX)/lib/tcllibc*/macosx-macports/tcllibc.dylib
</span> ../src/codesign.sh $?
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/vendor/patches/tcl/sqlite-extern.patch b/vendor/patches/tcl/sqlite-extern.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 1967367e2..f769b9a45 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/vendor/patches/tcl/sqlite-extern.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/vendor/patches/tcl/sqlite-extern.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,7 +27,7 @@ Make the normal sqlite3 API externally visible (until we switch to tdbc...)
</span> fi
# TEA specific: use LDFLAGS_DEFAULT instead of LDFLAGS
- SHLIB_LD='${CC} -dynamiclib ${CFLAGS} ${LDFLAGS_DEFAULT}'
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ SHLIB_LD='${CC} -dynamiclib ${CFLAGS} ${LDFLAGS_DEFAULT} -install_name $(pkglibdir)/$(PKG_LIB_FILE)'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ SHLIB_LD='${CC} -dynamiclib ${CFLAGS} ${LDFLAGS_DEFAULT} -install_name @executable_path/../lib/$(PKG_DIR)/$(PKG_LIB_FILE)'
</span> # TEA specific: link shlib with current and compatibility version flags
vers=`echo ${PACKAGE_VERSION} | sed -e 's/^\([0-9]\{1,5\}\)\(\(\.[0-9]\{1,3\}\)\{0,2\}\).*$/\1\2/p' -e d`
SHLIB_LD="${SHLIB_LD} -current_version ${vers:-0} -compatibility_version ${vers:-0}"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/vendor/tcl8.6.16/pkgs/sqlite3.47.2/configure b/vendor/tcl8.6.16/pkgs/sqlite3.47.2/configure
</span><span style='display:block; white-space:pre;color:#808080;'>index 3e85ace34..25bbf4a34 100755
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/vendor/tcl8.6.16/pkgs/sqlite3.47.2/configure
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/vendor/tcl8.6.16/pkgs/sqlite3.47.2/configure
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7817,7 +7817,7 @@ fi
</span> esac
fi
# TEA specific: use LDFLAGS_DEFAULT instead of LDFLAGS
<span style='display:block; white-space:pre;background:#ffe0e0;'>- SHLIB_LD='${CC} -dynamiclib ${CFLAGS} ${LDFLAGS_DEFAULT} -install_name $(pkglibdir)/$(PKG_LIB_FILE)'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SHLIB_LD='${CC} -dynamiclib ${CFLAGS} ${LDFLAGS_DEFAULT} -install_name @executable_path/../lib/$(PKG_DIR)/$(PKG_LIB_FILE)'
</span> # TEA specific: link shlib with current and compatibility version flags
vers=`echo ${PACKAGE_VERSION} | sed -e 's/^\([0-9]\{1,5\}\)\(\(\.[0-9]\{1,3\}\)\{0,2\}\).*$/\1\2/p' -e d`
SHLIB_LD="${SHLIB_LD} -current_version ${vers:-0} -compatibility_version ${vers:-0}"
</pre><pre style='margin:0'>
</pre>