Use relative load path for libsqlite3 too

macports · Feb 15, 2025 · 89ab095 · 89ab095
1 parent 51a9cbc
commit 89ab095
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 22 deletions.
diff --git a/Mk/macports.autoconf.mk.in b/Mk/macports.autoconf.mk.in
@@ -27,7 +27,7 @@ TCL_STUB_LIB_SPEC	= @TCL_STUB_LIB_SPEC@
 LIBS			= @LIBS@
 READLINE_LIBS		= @READLINE_LIBS@
 MD5_LIBS		= @MD5_LIBS@
-SQLITE3_LIBS		= @TCL_BIN_DIR@/pkgs/@SQLITE3_LIBNAME@/lib@SQLITE3_LIBNAME@$(SHLIB_SUFFIX)
+SQLITE3_LIBS		= @abs_top_builddir@/@VENDOR_DESTROOT@@TCL_PREFIX@/lib/@SQLITE3_LIBNAME@/lib@SQLITE3_LIBNAME@$(SHLIB_SUFFIX)
 CURL_LIBS		= @LDFLAGS_LIBCURL@
 INSTALL			= @INSTALL@
 MTREE			= @MTREE@

diff --git a/vendor/Makefile.in b/vendor/Makefile.in
diff --git a/vendor/patches/tcl/sqlite-extern.patch b/vendor/patches/tcl/sqlite-extern.patch
@@ -27,7 +27,7 @@ Make the normal sqlite3 API externally visible (until we switch to tdbc...)
  fi
  	    # TEA specific: use LDFLAGS_DEFAULT instead of LDFLAGS
 -	    SHLIB_LD='${CC} -dynamiclib ${CFLAGS} ${LDFLAGS_DEFAULT}'
-+	    SHLIB_LD='${CC} -dynamiclib ${CFLAGS} ${LDFLAGS_DEFAULT} -install_name $(pkglibdir)/$(PKG_LIB_FILE)'
++	    SHLIB_LD='${CC} -dynamiclib ${CFLAGS} ${LDFLAGS_DEFAULT} -install_name @executable_path/../lib/$(PKG_DIR)/$(PKG_LIB_FILE)'
  	    # 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}"
diff --git a/vendor/tcl8.6.16/pkgs/sqlite3.47.2/configure b/vendor/tcl8.6.16/pkgs/sqlite3.47.2/configure
@@ -7817,7 +7817,7 @@ fi
 esac
 fi
 	    # TEA specific: use LDFLAGS_DEFAULT instead of LDFLAGS
-	    SHLIB_LD='${CC} -dynamiclib ${CFLAGS} ${LDFLAGS_DEFAULT} -install_name $(pkglibdir)/$(PKG_LIB_FILE)'
+	    SHLIB_LD='${CC} -dynamiclib ${CFLAGS} ${LDFLAGS_DEFAULT} -install_name @executable_path/../lib/$(PKG_DIR)/$(PKG_LIB_FILE)'
 	    # 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}"