<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/6e4fc7b9174d344ad9388d25f24ec3efa4c3895d">https://github.com/macports/macports-ports/commit/6e4fc7b9174d344ad9388d25f24ec3efa4c3895d</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 6e4fc7b9174 icu: continue simplification
</span>6e4fc7b9174 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 6e4fc7b9174d344ad9388d25f24ec3efa4c3895d
</span>Author: Ken Cunningham <kencu@macports.org>
AuthorDate: Thu Apr 8 20:12:03 2021 -0700
<span style='display:block; white-space:pre;color:#404040;'> icu: continue simplification
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> pull out all the
</span><span style='display:block; white-space:pre;color:#404040;'> if {${supported_archs} ne "noarch"} {}
</span><span style='display:block; white-space:pre;color:#404040;'> blocks
</span>---
devel/icu/Portfile | 69 ++++++++++++++++++++++++------------------------------
1 file changed, 31 insertions(+), 38 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 e8de1cb036f..5617f2a1ff5 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;'>@@ -93,10 +93,7 @@ if {${subport} eq "${name}-lx"} {
</span> }
if { ${subport} eq "${name}" || ${subport} eq "${name}-lx"} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${supported_archs} ne "noarch" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PortGroup muniversal 1.0
</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:#e0ffe0;'>+ PortGroup muniversal 1.0
</span>
patchfiles-append patch-config-mh-darwin.diff
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -124,48 +121,44 @@ if { ${subport} eq "${name}" || ${subport} eq "${name}-lx"} {
</span> # http://bugs.icu-project.org/trac/ticket/10308
# http://bugs.icu-project.org/trac/ticket/6102
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${supported_archs} ne "noarch"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-build {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[variant_exists universal] && [variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set dirs {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach arch ${universal_archs_to_use} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend dirs ${worksrcpath}-${arch}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set dirs ${worksrcpath}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach dir ${dirs} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Remove architecture-specific differences to allow merging.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # we do not believe icu-config uses SIZEOF_VOID_P. Projects using Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # include files may experience problems. The developers of ICU suggest using
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # pkg-config over both icu-config and the Makefile includes.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # calling icu-config for the host information is not mentioned in any
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # icu man pages, differs between architectures, and can't be merged
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace {s| -DSIZEOF_VOID_P=[48]||g} ${dir}/config/Makefile.inc \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${dir}/config/icu-config
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -E {s| -arch +[^ ]+||g} ${dir}/config/pkgdata.inc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace {s|host=\".*\"|host=\"\"|g} ${dir}/config/icu-config
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace {s|host_alias=\".*\"|host_alias=\"\"|g} ${dir}/config/icu-config
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace {s|host_cpu=\".*\"|host_cpu=\"\"|g} ${dir}/config/icu-config
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-build {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_exists universal] && [variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set dirs {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach arch ${universal_archs_to_use} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend dirs ${worksrcpath}-${arch}
</span> }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set dirs ${worksrcpath}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach dir ${dirs} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Remove architecture-specific differences to allow merging.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # we do not believe icu-config uses SIZEOF_VOID_P. Projects using Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # include files may experience problems. The developers of ICU suggest using
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # pkg-config over both icu-config and the Makefile includes.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # calling icu-config for the host information is not mentioned in any
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # icu man pages, differs between architectures, and can't be merged
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace {s| -DSIZEOF_VOID_P=[48]||g} ${dir}/config/Makefile.inc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${dir}/config/icu-config
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -E {s| -arch +[^ ]+||g} ${dir}/config/pkgdata.inc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace {s|host=\".*\"|host=\"\"|g} ${dir}/config/icu-config
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace {s|host_alias=\".*\"|host_alias=\"\"|g} ${dir}/config/icu-config
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace {s|host_cpu=\".*\"|host_cpu=\"\"|g} ${dir}/config/icu-config
</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;'>- if {${supported_archs} ne "noarch"} {
</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.universal_args-delete --disable-dependency-tracking
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # ICU detects cross compiling by trying to run binaries.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # r73849 and #29904 indicate that cross compiling is a problem.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Of the solutions tried (r79660, r73865, and r73849), simply disallowing cross compiling is by far the simplest.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Note that #29904 should not show up again because universal now better recognizes 32/64-bit cross compiling (r79658)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- merger_must_run_binaries yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # ICU detects cross compiling by trying to run binaries.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # r73849 and #29904 indicate that cross compiling is a problem.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Of the solutions tried (r79660, r73865, and r73849), simply disallowing cross compiling is by far the simplest.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Note that #29904 should not show up again because universal now better recognizes 32/64-bit cross compiling (r79658)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ merger_must_run_binaries yes
</span>
# prevent ICU from finding installed icu when upgrading (#11981).
configure.cppflags
</pre><pre style='margin:0'>
</pre>