<pre style='margin:0'>
Daniel J. Luke (danielluke) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/9e8644517147e41ad3474629cd1ca50eca944bc7">https://github.com/macports/macports-ports/commit/9e8644517147e41ad3474629cd1ca50eca944bc7</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 9e864451714 bind9: fix on Leopard and PowerPC (#22639)
</span>9e864451714 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 9e8644517147e41ad3474629cd1ca50eca944bc7
</span>Author: Sergey Fedorov <vital.had@gmail.com>
AuthorDate: Fri Feb 16 09:18:04 2024 +0800
<span style='display:block; white-space:pre;color:#404040;'> bind9: fix on Leopard and PowerPC (#22639)
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * bind9: use path-style deps for libuv and jemalloc
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * bind9: depend on jemalloc on 10.6+, not earlier
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * bind9: fix compiler.blacklist to avoid picking gcc-4.0
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * bind9: fix broken PowerPC assembler in rwlock
</span>---
net/bind9/Portfile | 16 ++++++++++++----
net/bind9/files/patch-fix-rwlock.diff | 18 ++++++++++++++++++
2 files changed, 30 insertions(+), 4 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/bind9/Portfile b/net/bind9/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b3580f1d590..1da75a4c922 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/bind9/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/bind9/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,10 +38,10 @@ use_xz yes
</span> depends_build port:pkgconfig
depends_lib path:lib/libssl.dylib:openssl \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libuv \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/pkgconfig/libuv.pc:libuv \
</span> port:libxml2 \
port:nghttp2 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:jemalloc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/pkgconfig/jemalloc.pc:jemalloc \
</span> port:json-c \
port:libidn2 \
port:lmdb
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -52,12 +52,13 @@ universal_variant \
</span> # Needs working __atomic_* builtins
# Apple clang 15.0.0 from Xcode before 15.2 has a codgen bug that causes
compiler.blacklist \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- gcc-4.2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *gcc-4.0 *gcc-4.2 \
</span> {clang < 500} \
{clang >= 1500.0.40.1 < 1500.1.0.2.5 }
patchfiles atomics.patch \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- lib_dns_Makefile.in.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lib_dns_Makefile.in.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-fix-rwlock.diff
</span>
# tests require `sudo bin/tests/system/ifconfig.sh up`
test.run yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -92,6 +93,13 @@ platform darwin 9 {
</span> configure.args-append --with-dlopen=no
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.platform} eq "darwin" && ${os.major} < 10} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Until this is fixed: https://trac.macports.org/ticket/65945
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-delete \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/pkgconfig/jemalloc.pc:jemalloc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-jemalloc=no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-destroot {
# Ensure needed directories
xinstall -o named -g named -m 755 -d \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/bind9/files/patch-fix-rwlock.diff b/net/bind9/files/patch-fix-rwlock.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..5dddd8aa74a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/bind9/files/patch-fix-rwlock.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,18 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix PowerPC assembler syntax.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lib/isc/rwlock.c.orig 2023-12-08 20:09:37.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lib/isc/rwlock.c 2024-02-11 15:55:13.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -160,8 +160,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #elif (defined(__sparc) || defined(__sparc__)) && HAVE_SPARC_PAUSE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define isc_rwlock_pause() __asm__ __volatile__("pause")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #elif defined(__ppc__) || defined(_ARCH_PPC) || defined(_ARCH_PWR) || \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- defined(_ARCH_PWR2) || defined(_POWER)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ defined(_ARCH_PWR2) || defined(_POWER) || defined(__POWERPC__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define isc_rwlock_pause() __asm__ volatile("or r27,r27,r27")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define isc_rwlock_pause() __asm__ volatile("or 27,27,27")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else /* if defined(_MSC_VER) */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define isc_rwlock_pause()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif /* if defined(_MSC_VER) */
</span></pre><pre style='margin:0'>
</pre>