<pre style='margin:0'>
Marius Schamschula (Schamschula) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/c30c0346fc6f18c4e50bfb53cd62fe8755eeaf72">https://github.com/macports/macports-ports/commit/c30c0346fc6f18c4e50bfb53cd62fe8755eeaf72</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 c30c0346fc6 gnutls: only apply accelerated-aarch64 patch for 3.6.x
</span>c30c0346fc6 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit c30c0346fc6f18c4e50bfb53cd62fe8755eeaf72
</span>Author: Marius Schamschula <mps@macports.org>
AuthorDate: Sat May 21 08:18:55 2022 -0500
<span style='display:block; white-space:pre;color:#404040;'> gnutls: only apply accelerated-aarch64 patch for 3.6.x
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> don't disable hardware acceleration for aarch64
</span><span style='display:block; white-space:pre;color:#404040;'> whitespace
</span>---
devel/gnutls/Portfile | 39 +++++++++++++++++++--------------------
1 file changed, 19 insertions(+), 20 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/gnutls/Portfile b/devel/gnutls/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 2c9ad10a094..1d0537e87ac 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/gnutls/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/gnutls/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,13 +29,27 @@ checksums rmd160 d6bc8751c569db6033234c810b45eb661f77b4b4 \
</span>
subport ${name} {
conflicts ${name}-devel
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.platform} eq "darwin" && ${os.major} > 19 && ${os.arch} eq "arm"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append port:libtool
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # See: https://gitlab.com/gnutls/gnutls/-/issues/1317
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-lib-accelerated-aarch64-Makefile.am.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ use_autoreconf yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ autoreconf.args --install --verbose --force
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pre-configure {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 644 -W ${prefix}/share/libtool/build-aux config.guess config.sub ${worksrcpath}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
subport ${name}-devel {
conflicts ${name}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> version 3.7.5
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 1
</span>
checksums rmd160 4be3aae4df103b5fd6835f6abf6f6b98d6424699 \
sha256 1f85028475b4f255cc5b480af0c37e61eab43024c1507c8b75d6be506c0553ad \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -51,12 +65,12 @@ subport ${name}-devel {
</span> variant brotli description {Build brotli support} {
depends_lib-append \
port:brotli
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.args-delete \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-brotli
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --without-brotli
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${build_arch} ne "ppc" || ${build_arch} ne "ppc64"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${build_arch} ne "aarch64" || ${build_arch} ne "ppc" || ${build_arch} ne "ppc64"} {
</span> # see: https://gitlab.com/gnutls/gnutls/-/issues/1370
# and https://github.com/macports/macports-ports/pull/14613
configure.args-append --disable-hardware-acceleration
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -113,7 +127,6 @@ configure.args-append \
</span> --with-default-trust-store-pkcs11=pkcs11: \
ac_cv_prog_AWK=/usr/bin/awk
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> compiler.thread_local_storage yes
# Undefined symbols for architecture x86_64: "___get_cpuid_count"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -136,20 +149,6 @@ variant dane description {Build libdane using unbound libraries} {
</span> configure.args-delete --disable-libdane
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${os.platform} eq "darwin" && ${os.major} > 19 && ${os.arch} eq "arm"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append port:libtool
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # See: https://gitlab.com/gnutls/gnutls/-/issues/1317
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-lib-accelerated-aarch64-Makefile.am.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- use_autoreconf yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- autoreconf.args --install --verbose --force
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-configure {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 644 -W ${prefix}/share/libtool/build-aux config.guess config.sub ${worksrcpath}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # as of r120660 (#43881) unbound installs its root key file at ${prefix}/var/run/unbound/root.key
# the following may be superfluous
</pre><pre style='margin:0'>
</pre>