<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/2942f5f10eda9061638f6d80bbda63fd781f1f91">https://github.com/macports/macports-ports/commit/2942f5f10eda9061638f6d80bbda63fd781f1f91</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 2942f5f10ed icu: present consistent universal variant
</span>2942f5f10ed is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 2942f5f10eda9061638f6d80bbda63fd781f1f91
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Thu Mar 25 09:59:59 2021 +1100
<span style='display:block; white-space:pre;color:#404040;'> icu: present consistent universal variant
</span>---
devel/icu/Portfile | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/icu/Portfile b/devel/icu/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b04ec6722c3..33a7ee563c6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/icu/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/icu/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -198,13 +198,13 @@ if { ${subport} ne "${name}-docs" } {
</span> set platform [switch ${os.platform} {darwin {format MacOSX} freebsd {format FreeBSD}}]
configure.cmd ./runConfigureICU ${platform}
<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:#ffe0e0;'>- if {[variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${supported_archs} ne "noarch"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.universal_args-delete --disable-dependency-tracking
</span> # ICU detects cross compiling by trying to run binaries.
# r73849 and #29904 indicate that cross compiling is a problem.
# Of the solutions tried (r79660, r73865, and r73849), simply disallowing cross compiling is by far the simplest.
# Note that #29904 should not show up again because universal now better recognizes 32/64-bit cross compiling (r79658)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set merger_must_run_binaries "yes"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ merger_must_run_binaries yes
</span> }
# Fix bug #11981 that prevents ICU from building when upgrading.
</pre><pre style='margin:0'>
</pre>