<pre style='margin:0'>
MarcusCalhoun-Lopez pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/16ffb825fdfff84527a2d523782be8709cf7f520">https://github.com/macports/macports-ports/commit/16ffb825fdfff84527a2d523782be8709cf7f520</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 16ffb825fdfff84527a2d523782be8709cf7f520
</span>Author: mcalhoun@macports.org <mcalhoun@macports.org>
AuthorDate: Sat Aug 12 14:26:52 2017 -0700
<span style='display:block; white-space:pre;color:#404040;'> gmp: respect build_arch even when cross-compiling
</span>---
devel/gmp/Portfile | 54 ++++++++++++++++++++++++++++++
devel/gmp/files/patch-configfsf.guess.diff | 11 ++++++
2 files changed, 65 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/gmp/Portfile b/devel/gmp/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 75bbaee..ce8948d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/gmp/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/gmp/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,6 +5,7 @@ PortGroup muniversal 1.0
</span>
name gmp
version 6.1.2
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories devel math
license LGPL-3+
maintainers mcalhoun openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -161,6 +162,59 @@ if {![variant_isset universal]} {
</span> } else {
configure.env-append ABI=32
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set uname_processor ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${os.arch} eq "i386" && ( ${build_arch} eq "ppc" || ${build_arch} eq "ppc64" ) } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set uname_processor powerpc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${os.arch} eq "powerpc" && ( ${build_arch} eq "i386" || ${build_arch} eq "x86_64" ) } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set uname_processor i386
</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;'>+ if {${uname_processor} ne ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # cross compiling
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cc ${configure.cc} -arch ${build_arch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cxx ${configure.cxx} -arch ${build_arch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set build_processor ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${os.arch} eq "i386" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${build_arch} eq "ppc64"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set build_processor powerpc64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${build_arch} eq "ppc" && ${os.major} > 10} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set build_processor powerpc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${build_arch} eq "x86_64" && (${os.major} < 9 || [sysctl hw.cpu64bit_capable] == 0)} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set build_processor x86_64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${build_arch} eq "i386"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set build_processor i686
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${build_arch} eq "x86_64"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set build_processor x86_64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${build_arch} eq "ppc64" && (${os.major} < 9 || [sysctl hw.cpu64bit_capable] == 0)} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set build_processor powerpc64
</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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${auto_cpu}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${build_processor} eq "" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-configfsf.guess.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "s|__MACPORTS_UNAME_PROCESSOR__|${uname_processor}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/configfsf.guess
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --host=${build_processor}-apple-${os.platform}${os.version}
</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;'>+ }
</span> } else {
# Keep configure.cflags and configure.cxxflags empty.
set merger_arch_flag no
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/gmp/files/patch-configfsf.guess.diff b/devel/gmp/files/patch-configfsf.guess.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..81a57f2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/gmp/files/patch-configfsf.guess.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configfsf.guess.orig 2016-12-16 08:45:27.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configfsf.guess 2017-08-02 22:21:02.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1279,7 +1279,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ exit ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *:Darwin:*:*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ UNAME_PROCESSOR=__MACPORTS_UNAME_PROCESSOR__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ eval $set_cc_for_build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test "$UNAME_PROCESSOR" = unknown ; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ UNAME_PROCESSOR=powerpc
</span></pre><pre style='margin:0'>
</pre>