<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/f0ec05eb0777ca4d3c5c4232edab387ba7a6f2e5">https://github.com/macports/macports-ports/commit/f0ec05eb0777ca4d3c5c4232edab387ba7a6f2e5</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit f0ec05eb0777ca4d3c5c4232edab387ba7a6f2e5
</span>Author: Ken Cunningham <kencu@macports.org>
AuthorDate: Sat Jan 16 10:45:52 2021 -0800
<span style='display:block; white-space:pre;color:#404040;'> icu: repair multiarch universal build
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> icu-config embeds host information about the
</span><span style='display:block; white-space:pre;color:#404040;'> host that configure ran on. This information is
</span><span style='display:block; white-space:pre;color:#404040;'> different for each supported arch, and can't be merged.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> icu-config --host
</span><span style='display:block; white-space:pre;color:#404040;'> is not mentioned in the icu-config manpages anywhwere
</span><span style='display:block; white-space:pre;color:#404040;'> and has no perceived useful purpose
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> so nullify the arch-specific differences between the
</span><span style='display:block; white-space:pre;color:#404040;'> icu-config script to allow a universal icu to be
</span><span style='display:block; white-space:pre;color:#404040;'> built once again
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> the other option would be to write a new icu-config
</span><span style='display:block; white-space:pre;color:#404040;'> script that can handle multi-arch logic. What this
</span><span style='display:block; white-space:pre;color:#404040;'> script would be expected to output, and how and why
</span><span style='display:block; white-space:pre;color:#404040;'> it would be ever used, is not clear, however, so this
</span><span style='display:block; white-space:pre;color:#404040;'> option is considered less desirable
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> closes: https://trac.macports.org/ticket/45268
</span>---
devel/icu/Portfile | 11 +++++++++++
1 file changed, 11 insertions(+)
<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 de7cc878284..5544bd4dfc0 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;'>@@ -180,6 +180,17 @@ if { ${subport} ne "${name}-docs" } {
</span> ${dir}/config/icu-config
reinplace -E {s| -arch +[^ ]+||g} \
${dir}/config/pkgdata.inc
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # remove architecture-specific host information
</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 as an option, differs between architectures, and can't be merged
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://trac.macports.org/ticket/45268
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace {s|host=\".*\"|host=\"\"|g} \
</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 {s|host_alias=\".*\"|host_alias=\"\"|g} \
</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 {s|host_cpu=\".*\"|host_cpu=\"\"|g} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${dir}/config/icu-config
</span> }
}
}
</pre><pre style='margin:0'>
</pre>