<pre style='margin:0'>
Zhenfu Shi (i0ntempest) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/4b4383b53db935a6dc2a6deb253cce1dfa735931">https://github.com/macports/macports-ports/commit/4b4383b53db935a6dc2a6deb253cce1dfa735931</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 4b4383b53db tor: fix build with Xcode/CLT 14
</span>4b4383b53db is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 4b4383b53db935a6dc2a6deb253cce1dfa735931
</span>Author: i0ntempest <szf1234@me.com>
AuthorDate: Thu Sep 15 01:07:08 2022 -0400
<span style='display:block; white-space:pre;color:#404040;'> tor: fix build with Xcode/CLT 14
</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/65838
</span>---
security/tor/Portfile | 3 +++
security/tor/files/patch-remove-symdef.patch | 18 ++++++++++++++++++
2 files changed, 21 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/tor/Portfile b/security/tor/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 95a30ebf07b..bdd5cd83c13 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/tor/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/security/tor/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -43,6 +43,9 @@ configure.args-append \
</span> --disable-lzma \
--disable-zstd
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Xcode 14: ld: archive member '__.SYMDEF SORTED' is not mach-o or llvm bitcode file
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-remove-symdef.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-destroot {
# Create a working torrc file with basic, locked-down permissions
xinstall -o ${torUser} -g ${torGroup} -m 0640 ${destroot}${prefix}/etc/${name}/torrc.sample ${destroot}${prefix}/etc/${name}/torrc
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/tor/files/patch-remove-symdef.patch b/security/tor/files/patch-remove-symdef.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..48f00adb65d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/security/tor/files/patch-remove-symdef.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,18 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./scripts/build/combine_libs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./scripts/build/combine_libs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -22,6 +22,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mkdir "$dir"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cd "$dir" >/dev/null
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "${AR:-ar}" x "$abs"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # Delete the "__.SYMDEF*" file if present, it will be generated
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # by ranlib at the end on the combined library
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if [ -f "__.SYMDEF SORTED" ]; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ rm -f "__.SYMDEF SORTED"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if [ -f "__.SYMDEF" ]; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ rm -f "__.SYMDEF"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ done
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cd "$TMPDIR" >/dev/null
</span></pre><pre style='margin:0'>
</pre>