<pre style='margin:0'>
Jeremy Huddleston Sequoia (jeremyhu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/76a2cdc1845f762fdcda9ceea660831969ec5264">https://github.com/macports/macports-ports/commit/76a2cdc1845f762fdcda9ceea660831969ec5264</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 76a2cdc1845f762fdcda9ceea660831969ec5264
</span>Author: Jeremy Huddleston Sequoia <jeremyhu@macports.org>
AuthorDate: Sun Jul 19 23:07:03 2020 -0700
<span style='display:block; white-space:pre;color:#404040;'> libiconv: Simplify muniversal configuration for Apple Silicon
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@macports.org>
</span>---
textproc/libiconv/Portfile | 39 ++++++++++++++-------------------------
1 file changed, 14 insertions(+), 25 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/libiconv/Portfile b/textproc/libiconv/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7adb507b693..a30ec819a4c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/textproc/libiconv/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/libiconv/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,7 +7,7 @@ PortGroup xcodeversion 1.0
</span>
name libiconv
version 1.16
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> checksums rmd160 770adf60b3099e5dcae434c1b6301d8c58330a49 \
sha256 e6a1b1b589654277ee790cce3734f07876ac4ccfaecbee8afa0b649cf529cc04 \
size 5166734
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,6 +20,8 @@ homepage https://www.gnu.org/software/libiconv/
</span> master_sites gnu
use_parallel_build yes
<span style='display:block; white-space:pre;background:#e0ffe0;'>+supported_archs ppc ppc64 i386 x86_64 arm64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> description \
Character set conversion library
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -88,31 +90,18 @@ post-destroot {
</span>
if { [variant_isset universal] } {
# When cross-compiling, can guess wrong endian value.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.arch} eq "i386"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${os.major} >= 10 } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend merger_configure_env(ppc) cl_cv_sys_endian='big endian'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set cross_archs "ppc ppc64"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend merger_configure_env(ppc64) cl_cv_sys_endian='big endian'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set cross_archs "ppc64"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend merger_configure_env(i386) cl_cv_sys_endian='little endian'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend merger_configure_env(x86_64) cl_cv_sys_endian='little endian'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set cross_archs "i386 x86_64"
</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:#ffe0e0;'>- foreach arch ${cross_archs} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend merger_configure_env(ppc) cl_cv_sys_endian='big endian'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend merger_configure_env(ppc64) cl_cv_sys_endian='big endian'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend merger_configure_env(i386) cl_cv_sys_endian='little endian'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend merger_configure_env(x86_64) cl_cv_sys_endian='little endian'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend merger_configure_env(arm64) cl_cv_sys_endian='little endian'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach arch ${supported_archs} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # See https://trac.macports.org/ticket/18440
</span> lappend merger_configure_env(${arch}) \
ac_cv_func_malloc_0_nonnull='yes' \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- gl_cv_func_malloc_0_nonnull='1'
</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:#ffe0e0;'>- # See https://trac.macports.org/ticket/18440
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} == 8} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach arch "ppc64 x86_64" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend merger_configure_env(${arch}) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- am_cv_func_iconv='yes' \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- am_cv_proto_iconv_arg1='const'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gl_cv_func_malloc_0_nonnull='1' \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ am_cv_func_iconv='yes' \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ am_cv_proto_iconv_arg1='const'
</span> }
}
</pre><pre style='margin:0'>
</pre>