icu: present consistent universal variant

macports · Mar 24, 2021 · 2942f5f · 2942f5f
1 parent ae852a7
commit 2942f5f
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/devel/icu/Portfile b/devel/icu/Portfile
@@ -198,13 +198,13 @@ if { ${subport} ne "${name}-docs" } {
     set platform [switch ${os.platform} {darwin {format MacOSX} freebsd {format FreeBSD}}]
     configure.cmd   ./runConfigureICU ${platform}
 
-    configure.universal_args-delete --disable-dependency-tracking
-    if {[variant_isset universal]} {
+    if {${supported_archs} ne "noarch"} {
+        configure.universal_args-delete --disable-dependency-tracking
         # 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)
-        set merger_must_run_binaries "yes"
+        merger_must_run_binaries yes
     }
 
     # Fix bug #11981 that prevents ICU from building when upgrading.