<pre style='margin:0'>
Ken (kencu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/4fdf0eee0bd52de8e65b5dfb7328f3aaa79c4ee9">https://github.com/macports/macports-ports/commit/4fdf0eee0bd52de8e65b5dfb7328f3aaa79c4ee9</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 4fdf0eee0bd botan: fix cross-arch universal building
</span>4fdf0eee0bd is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 4fdf0eee0bd52de8e65b5dfb7328f3aaa79c4ee9
</span>Author: Dean M Greer <38226388+Gcenx@users.noreply.github.com>
AuthorDate: Fri Dec 30 19:45:48 2022 -0500
<span style='display:block; white-space:pre;color:#404040;'> botan: fix cross-arch universal building
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> allows universal arm64/x86_64 and others
</span><span style='display:block; white-space:pre;color:#404040;'> closes: https://trac.macports.org/ticket/59945
</span>---
security/botan/Portfile | 22 ++++++++--------------
1 file changed, 8 insertions(+), 14 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/botan/Portfile b/security/botan/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 226cbbeff63..ea39fe668ca 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/botan/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/security/botan/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup muniversal 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup muniversal 1.1
</span> PortGroup openssl 1.0
PortGroup legacysupport 1.1
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -110,20 +110,14 @@ variant native description {Enable all intrinsics} {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# botan way of setting cpu type in build phase
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-array set merger_configure_args {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ppc --cpu=ppc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- i386 --cpu=ia32
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ppc64 --cpu=ppc64
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- x86_64 --cpu=amd64
</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;'>-if {(!${universal_possible} || ![variant_isset universal]) && [info exists merger_configure_args(${build_arch})]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append $merger_configure_args(${build_arch})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args.ppc "--cpu=ppc --cc-abi-flags='-arch ppc'"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args.i386 "--cpu=ia32 --cc-abi-flags='-arch i386'"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args.ppc64 "--cpu=ppc64 --cc-abi-flags='-arch ppc64'"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args.x86_64 "--cpu=amd64 --cc-abi-flags='-arch x86_64'"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args.arm64 "--cpu=arm64 --cc-abi-flags='-arch arm64'"
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# configure.py rejects this argument
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.universal_args-delete --disable-dependency-tracking
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# configure.py rejects --host
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+triplet.add_host {none}
</span>
livecheck.regex Botan-(${branch}\\.\[0-9.\]+)${extract.suffix}
</pre><pre style='margin:0'>
</pre>