<pre style='margin:0'>
Ryan Carsten Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/8707fad8630a14d230bdcc612d08ca19d30f4180">https://github.com/macports/macports-ports/commit/8707fad8630a14d230bdcc612d08ca19d30f4180</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 8707fad8630 sqlite3: Avoid rpath; tweak install name
</span>8707fad8630 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 8707fad8630a14d230bdcc612d08ca19d30f4180
</span>Author: Ryan Carsten Schmidt <ryandesign@macports.org>
AuthorDate: Sat Feb 8 17:58:17 2025 -0600
<span style='display:block; white-space:pre;color:#404040;'> sqlite3: Avoid rpath; tweak install name
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Don't use -rpath since it's never needed and causes an error with older
</span><span style='display:block; white-space:pre;color:#404040;'> compilers.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/72018
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Change the install name from /opt/local/lib/libsqlite3.dylib back to
</span><span style='display:block; white-space:pre;color:#404040;'> /opt/local/lib/libsqlite3.0.dylib as it was in 3.48.0 and earlier.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Simplify how the install name is fixed and do so in post-build not
</span><span style='display:block; white-space:pre;color:#404040;'> post-destroot.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/72021
</span>---
databases/sqlite3/Portfile | 13 ++++++++++---
databases/sqlite3/files/no-rpath.patch | 13 +++++++++++++
2 files changed, 23 insertions(+), 3 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/sqlite3/Portfile b/databases/sqlite3/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7c4480cd0c1..a95875e3bb2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/sqlite3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/sqlite3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,10 +4,9 @@ PortSystem 1.0
</span> PortGroup clang_dependency 1.0
name sqlite3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# update libsqlite3.dylib to libsqlite3.0.dylib in post-destroot on next version update
</span> # don't forget to update the checksums for sqlite3-tools when updating sqlite3
version 3.49.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span> categories databases
license public-domain
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -65,6 +64,9 @@ platform darwin 8 {
</span> }
if {${subport} eq ${name}} {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ no-rpath.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-patch {
# See https://sqlite.org/forum/forumpost/566126d8c7 this should not
# be needed for future versions
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -87,13 +89,18 @@ if {${subport} eq ${name}} {
</span> -DSQLITE_SOUNDEX \
-I${worksrcpath}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-build {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${worksrcpath} "install_name_tool -id [shellescape ${prefix}/lib/libsqlite3.0.dylib] libsqlite3.dylib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-destroot {
xinstall -m 644 ${worksrcpath}/${name}.1 ${destroot}${prefix}/share/man/man1
<span style='display:block; white-space:pre;background:#ffe0e0;'>- system "install_name_tool -id [shellescape ${prefix}/lib/libsqlite3.dylib] [shellescape ${destroot}${prefix}/lib/libsqlite3.${version}.dylib]"
</span> }
}
subport ${name}-tcl {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_lib port:tcl
configure.dir ${worksrcpath}/tea
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/sqlite3/files/no-rpath.patch b/databases/sqlite3/files/no-rpath.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..5392e31a9b6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/sqlite3/files/no-rpath.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Don't use -rpath. It's not needed in MacPorts and causes an error with
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+older compilers.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- autosetup/proj.tcl.orig 2025-02-06 07:59:25.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ autosetup/proj.tcl 2025-02-08 18:16:09.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -918,6 +918,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # checked here will work but then fails at build-time, and the current
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # order of checks reflects that.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ proc proj-check-rpath {} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ define LDFLAGS_RPATH ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set rc 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[proj-opt-was-provided libdir]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ || [proj-opt-was-provided exec-prefix]} {
</span></pre><pre style='margin:0'>
</pre>