<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/efd9290c9cf0a1c7d4943cbf22eb3fc6aa02b979">https://github.com/macports/macports-ports/commit/efd9290c9cf0a1c7d4943cbf22eb3fc6aa02b979</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 efd9290c9cf icu: move rest of large notes to footnotes
</span>efd9290c9cf is described below
<span style='display:block; white-space:pre;color:#808000;'>commit efd9290c9cf0a1c7d4943cbf22eb3fc6aa02b979
</span>Author: Ken Cunningham <kencu@macports.org>
AuthorDate: Sun Apr 11 15:54:03 2021 -0700
<span style='display:block; white-space:pre;color:#404040;'> icu: move rest of large notes to footnotes
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> improves readability
</span>---
devel/icu/Portfile | 25 ++++++++++++++-----------
1 file changed, 14 insertions(+), 11 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 8847ba1322d..dbe9cc64b5c 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;'>@@ -35,21 +35,14 @@ set docdir ${prefix}/share/doc/${name}
</span>
if {${subport} eq ${name} || ${subport} eq "${name}-lx"} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # prior to 10.14, universal means different library bit depths or endianness,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # so we had to build separately and lipo together using the muniversal PG
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # We can't easily use the muniversal PG on darwin20+ (footnote 1), however we don't
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # need to use it because the universal build there has the same library bit
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # depth and endianness on both Intel and arm64. Therefore we can build universal in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # one pass using clang's ability to generate both archs at once.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # we will only use the muniversal PG on < 10.18. (see footnote 1).
</span> set using_muniversal_PG false
if {${os.platform} eq "darwin" && ${os.major} < 18} {
set using_muniversal_PG true
PortGroup muniversal 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # ICU needs to run binaries when building, to generate its data. (see footnote 1).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # ICU needs to run binaries when building, to generate its data. (see footnote 2).
</span> merger_must_run_binaries yes
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -96,7 +89,7 @@ if {${subport} eq ${name} || ${subport} eq "${name}-lx"} {
</span> set dirs ${worksrcpath}
}
foreach dir ${dirs} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Remove architecture-specific differences to allow merging. (See footnote 2).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Remove architecture-specific differences to allow merging. (See footnote 3).
</span> reinplace {s| -DSIZEOF_VOID_P=[48]||g} ${dir}/config/Makefile.inc \
${dir}/config/icu-config
reinplace -E {s| -arch +[^ ]+||g} ${dir}/config/pkgdata.inc
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -192,12 +185,22 @@ if {${subport} eq ${name}} {
</span> }
# Note 1:
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # prior to 10.14, universal means different library bit depths or endianness,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # so we had to build separately and lipo together using the muniversal PG
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # We can't easily use the muniversal PG on darwin20+ (footnote 2), however we don't
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # need to use it because the universal build there has the same library bit
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # depth and endianness on both Intel and arm64. Therefore we can build universal in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # one pass using clang's ability to generate both archs at once.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Note 2:
</span> # ICU needs to run binaries when building, to generate its data.
# Simply disallowing cross compiling is the simplest solution, however
# that means that an x86_64/arm64 universal version can never be built on an Intel Mac.
# ancient refs: #29904, ancient solutions tried (r79660, r73865, and r73849)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Note 2:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Note 3:
</span> # Remove architecture-specific differences to allow merging. (See note 2).
# we do not believe icu-config uses SIZEOF_VOID_P. Projects using Makefile
# include files may experience problems. The developers of ICU suggest using
</pre><pre style='margin:0'>
</pre>