[115752] trunk/dports/_resources/port1.0/group/muniversal-1.0.tcl

jeremyhu at macports.org jeremyhu at macports.org
Fri Jan 10 12:33:33 PST 2014


Revision: 115752
          https://trac.macports.org/changeset/115752
Author:   jeremyhu at macports.org
Date:     2014-01-10 12:33:33 -0800 (Fri, 10 Jan 2014)
Log Message:
-----------
muniversal: --host argument does not need to match deployment target.

Modified Paths:
--------------
    trunk/dports/_resources/port1.0/group/muniversal-1.0.tcl

Modified: trunk/dports/_resources/port1.0/group/muniversal-1.0.tcl
===================================================================
--- trunk/dports/_resources/port1.0/group/muniversal-1.0.tcl	2014-01-10 20:13:31 UTC (rev 115751)
+++ trunk/dports/_resources/port1.0/group/muniversal-1.0.tcl	2014-01-10 20:33:33 UTC (rev 115752)
@@ -243,18 +243,12 @@
                 }
                 # check if building for a completely different arch
                 if {$bits_differ || (${os.arch}=="i386" && (${arch}=="ppc" || ${arch}=="ppc64"))
-                        || (${os.arch}=="powerpc" && (${arch}=="i386" || ${arch}=="x86_64"))
-                        || $macosx_deployment_target != $macosx_version} {
-                    if {$macosx_deployment_target == $macosx_version} {
-                        set hostversion ${os.version}
-                    } else {
-                        set hostversion [expr [lindex [split $macosx_deployment_target .] 1] + 4]
-                    }
+                        || (${os.arch}=="powerpc" && (${arch}=="i386" || ${arch}=="x86_64"))} {
                     switch -- ${arch} {
-                        x86_64  {set host "--host=x86_64-apple-${os.platform}${hostversion}"}
-                        i386    {set host "--host=i686-apple-${os.platform}${hostversion}"}
-                        ppc     {set host "--host=powerpc-apple-${os.platform}${hostversion}"}
-                        ppc64   {set host "--host=powerpc64-apple-${os.platform}${hostversion}"}
+                        x86_64  {set host "--host=x86_64-apple-${os.platform}${os.version}"}
+                        i386    {set host "--host=i686-apple-${os.platform}${os.version}"}
+                        ppc     {set host "--host=powerpc-apple-${os.platform}${os.version}"}
+                        ppc64   {set host "--host=powerpc64-apple-${os.platform}${os.version}"}
                     }
                 }
             }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140110/e963dc13/attachment.html>


More information about the macports-changes mailing list