[45819] trunk/dports/_resources/port1.0/group/merge_universal-1.0.tcl

[mcalhoun at macports.org]

Revision: 45819
          http://trac.macports.org/changeset/45819
Author:   mcalhoun at macports.org
Date:     2009-01-22 13:39:18 -0800 (Thu, 22 Jan 2009)
Log Message:
-----------
merge_universal-1.0.tcl: Put the -arch (or -m) flag in configure.ldflags.
Append -arch (or -m) to configure.cc and configure.cxx for those ports (such as zlib)
    which use configure.cc as a linker but don't use ldflags.

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

Modified: trunk/dports/_resources/port1.0/group/merge_universal-1.0.tcl
===================================================================
--- trunk/dports/_resources/port1.0/group/merge_universal-1.0.tcl	2009-01-22 19:52:14 UTC (rev 45818)
+++ trunk/dports/_resources/port1.0/group/merge_universal-1.0.tcl	2009-01-22 21:39:18 UTC (rev 45819)
@@ -89,11 +89,12 @@
             }
             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})
             }
-
+            
             # Don't set the --host unless we have to.
             set host ""
             if { ${os.arch}=="i386" && (${arch}=="ppc" || ${arch}=="ppc64") } {
@@ -119,6 +120,11 @@
                 configure.args-append  $merger_configure_args(${arch})
             }
 
+            set configure_cc_save ${configure.cc}
+            set configure_cxx_save ${configure.cxx}
+            configure.cc   ${configure.cc}  ${archf}
+            configure.cxx  ${configure.cxx} ${archf}
+
             set worksrcpathSave  ${worksrcpath}
             set worksrcpath  ${workpath}/${arch}
 
@@ -126,6 +132,8 @@
 
             # Undo changes to the configure related variables
             set worksrcpath  ${worksrcpathSave}
+            configure.cc   ${configure_cc_save}
+            configure.cxx  ${configure_cxx_save}
             if { [info exists merger_configure_args(${arch})] } {
                 configure.args-delete  $merger_configure_args(${arch})
             }
@@ -133,6 +141,7 @@
             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}
         }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090122/e38250c3/attachment.html>