[62480] branches/release_1_8/base

[ryandesign at macports.org]

Revision: 62480
          http://trac.macports.org/changeset/62480
Author:   ryandesign at macports.org
Date:     2010-01-08 20:25:14 -0800 (Fri, 08 Jan 2010)
Log Message:
-----------
merge r60662, r60680, r62479 from trunk: put relevant build_arch flags in LDFLAGS too

Revision Links:
--------------
    http://trac.macports.org/changeset/60662
    http://trac.macports.org/changeset/60680
    http://trac.macports.org/changeset/62479

Modified Paths:
--------------
    branches/release_1_8/base/ChangeLog
    branches/release_1_8/base/src/port1.0/portconfigure.tcl

Property Changed:
----------------
    branches/release_1_8/base/


Property changes on: branches/release_1_8/base
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/gsoc08-privileges/base:37343-46937
/branches/universal-sanity/base:51872-52323
/branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base:55268,55279,55281,55285,55317,55385,55417,55591,55594,55679,55767,55793,55825,56147,56160,56162,56435,56448,56472-56474,56666,56889,57026,57048,57055,57131,57255,57436,57441,57784,57801,57820,57871,57974,57979,57982,58093,58445,58776-58777,58788,59318,59585,59597,59654,60259-60260,60774,60798,61302,61385,61770,62172,62194,62220,62230
/users/perry/base-bugs_and_notes:45682-46060
/users/perry/base-select:44044-44692
   + /branches/gsoc08-privileges/base:37343-46937
/branches/universal-sanity/base:51872-52323
/branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base:55268,55279,55281,55285,55317,55385,55417,55591,55594,55679,55767,55793,55825,56147,56160,56162,56435,56448,56472-56474,56666,56889,57026,57048,57055,57131,57255,57436,57441,57784,57801,57820,57871,57974,57979,57982,58093,58445,58776-58777,58788,59318,59585,59597,59654,60259-60260,60662,60680,60774,60798,61302,61385,61770,62172,62194,62220,62230,62479
/users/perry/base-bugs_and_notes:45682-46060
/users/perry/base-select:44044-44692

Modified: branches/release_1_8/base/ChangeLog
===================================================================
--- branches/release_1_8/base/ChangeLog	2010-01-09 04:18:43 UTC (rev 62479)
+++ branches/release_1_8/base/ChangeLog	2010-01-09 04:25:14 UTC (rev 62480)
@@ -5,6 +5,10 @@
 
 Release 1.8.3 (unreleased):
 
+    - Some of the build_arch flags now appear in LDFLAGS as well, fixing
+      several ports when building for a different architecture (jeremyhu in
+      r60662, jmr in r60680)
+
     - Fixed 'merge' proc for paths with spaces, and for symlinks on Snow
       Leopard, and added an error message for when 'merge' is not called
       correctly (ryandesign in r58776, r58777, r58778)

Modified: branches/release_1_8/base/src/port1.0/portconfigure.tcl
===================================================================
--- branches/release_1_8/base/src/port1.0/portconfigure.tcl	2010-01-09 04:18:43 UTC (rev 62479)
+++ branches/release_1_8/base/src/port1.0/portconfigure.tcl	2010-01-09 04:25:14 UTC (rev 62480)
@@ -153,6 +153,8 @@
 
 options configure.build_arch
 default configure.build_arch {${build_arch}}
+options configure.ld_archflags
+default configure.ld_archflags {[portconfigure::configure_get_ld_archflags]}
 foreach tool {cc cxx objc f77 f90 fc} {
     options configure.${tool}_archflags
     default configure.${tool}_archflags  "\[portconfigure::configure_get_archflags $tool\]"
@@ -231,6 +233,19 @@
     return $flags
 }
 
+# internal function to determine the ld flags to select an arch
+# Unfortunately there's no consistent way to do this when the compiler
+# doesn't support -arch, because it could be used to link rather than using
+# ld directly. So we punt and let portfiles deal with that case.
+proc portconfigure::configure_get_ld_archflags {args} {
+    global configure.build_arch
+    if {${configure.build_arch} != "" && [arch_flag_supported]} {
+        set flags "-arch ${configure.build_arch}"
+    } else {
+        return ""
+    }
+}
+
 # internal function to determine the "-arch xy" flags for the compiler
 proc portconfigure::configure_get_universal_archflags {args} {
     global configure.universal_archs
@@ -459,7 +474,7 @@
     global configure.env configure.pipe configure.libs configure.classpath configure.universal_args
     global configure.perl configure.python configure.ruby configure.install configure.awk configure.bison configure.pkg_config configure.pkg_config_path
     global configure.ccache configure.distcc configure.cpp configure.javac configure.march configure.mtune
-    foreach tool {cc cxx objc f77 f90 fc} {
+    foreach tool {cc cxx objc f77 f90 fc ld} {
         global configure.${tool} configure.${tool}_archflags
     }
     foreach flags {cflags cppflags cxxflags objcflags ldflags fflags f90flags fcflags} {
@@ -552,7 +567,7 @@
             append_list_to_environment_value configure "LDFLAGS" ${configure.universal_ldflags}
             eval configure.pre_args-append ${configure.universal_args}
         } else {
-            foreach {tool flags} {cc CFLAGS cxx CXXFLAGS objc OBJCFLAGS f77 FFLAGS f90 F90FLAGS fc FCFLAGS} {
+            foreach {tool flags} {cc CFLAGS cxx CXXFLAGS objc OBJCFLAGS f77 FFLAGS f90 F90FLAGS fc FCFLAGS ld LDFLAGS} {
                 append_list_to_environment_value configure $flags [set configure.${tool}_archflags]
                 if {${configure.march} != {}} {
                     append_list_to_environment_value configure $flags "-march=${configure.march}"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100108/3950b4cd/attachment.html>