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

[mcalhoun at macports.org]

Revision: 47747
          http://trac.macports.org/changeset/47747
Author:   mcalhoun at macports.org
Date:     2009-03-04 17:12:17 -0800 (Wed, 04 Mar 2009)
Log Message:
-----------
muniversal-1.0.tcl: Add variable merger_arch_flag which stops configure stage from adding -arch to configure.xxxflags.

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	2009-03-04 23:52:30 UTC (rev 47746)
+++ trunk/dports/_resources/port1.0/group/muniversal-1.0.tcl	2009-03-05 01:12:17 UTC (rev 47747)
@@ -41,6 +41,7 @@
 #      merger_configure_cflags: associative array of configure.cflags
 #    merger_configure_cxxflags: associative array of configure.cxxflags
 #     merger_configure_ldflags: associative array of configure.ldflags
+#             merger_arch_flag: if no, -arch xxx will not be appended configure.???flags
 #          merger_destroot_env: assoicative array of desroot.env variables
 #             merger_dont_diff: list of file names for which diff will not work
 #     merger_must_run_binaries: if yes, build platform must be able to run binaries for supported architectures
@@ -58,6 +59,26 @@
     set merger_no_3_archs "no"
 }
 
+proc muniversal_get_arch_flag {arch} {
+    global os.arch
+    # Prefer -m to -arch
+    set archf "-arch ${arch}"
+    if { ${os.arch}=="i386" && ${arch}=="i386" } {
+        set archf -m32
+    } elseif { ${os.arch}=="i386" && ${arch}=="x86_64" } {
+        set archf -m64
+    } elseif { ${os.arch}=="powerpc" && ${arch}=="ppc" } {
+        set archf -m32
+    } elseif { ${os.arch}=="powerpc" && ${arch}=="ppc64" } {
+        set archf -m64
+    }
+    return ${archf}
+}
+
+if { ! [info exists merger_arch_flag ] } {
+        set merger_arch_flag "yes"
+}
+
 variant universal {
     global universal_archs_to_use
 
@@ -135,10 +156,13 @@
             copy ${worksrcpath} ${workpath}/${arch}
 
             set archf [muniversal_get_arch_flag ${arch}]
-            configure.cflags-append    ${archf}
-            configure.cxxflags-append  ${archf}
-            configure.ldflags-append   ${archf}
 
+            if { ${merger_arch_flag} != "no" } {
+                configure.cflags-append    ${archf}
+                configure.cxxflags-append  ${archf}
+                configure.ldflags-append   ${archf}
+            }
+
             if { [info exists merger_configure_env(${arch})] } {
                 configure.env-append  $merger_configure_env(${arch})
             }
@@ -190,6 +214,7 @@
 
             set configure_cc_save ${configure.cc}
             set configure_cxx_save ${configure.cxx}
+
             configure.cc   ${configure.cc}  ${archf}
             configure.cxx  ${configure.cxx} ${archf}
 
@@ -221,9 +246,11 @@
             if { [info exists merger_configure_env(${arch})] } {
                 configure.env-delete  $merger_configure_env(${arch})
             }
-            configure.ldflags-delete  ${archf}
-            configure.cxxflags-delete ${archf}
-            configure.cflags-delete ${archf}
+            if { ${merger_arch_flag} != "no" } {
+                configure.ldflags-delete   ${archf}
+                configure.cxxflags-delete  ${archf}
+                configure.cflags-delete    ${archf}
+            }
         }
     }
 
@@ -405,20 +432,4 @@
             }
         }
     }
-
-    proc muniversal_get_arch_flag {arch} {
-        global os.arch
-        # Prefer -m to -arch
-        set archf "-arch ${arch}"
-        if { ${os.arch}=="i386" && ${arch}=="i386" } {
-            set archf -m32
-        } elseif { ${os.arch}=="i386" && ${arch}=="x86_64" } {
-            set archf -m64
-        } elseif { ${os.arch}=="powerpc" && ${arch}=="ppc" } {
-            set archf -m32
-        } elseif { ${os.arch}=="powerpc" && ${arch}=="ppc64" } {
-            set archf -m64
-        }
-        return ${archf}
-    }
 }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090304/15da3816/attachment.html>