[31414] branches/release_1_6/base

[jmpp at macports.org]

Revision: 31414
          http://trac.macosforge.org/projects/macports/changeset/31414
Author:   jmpp at macports.org
Date:     2007-11-22 10:32:27 -0800 (Thu, 22 Nov 2007)

Log Message:
-----------
Merged revisions 31406-31413 via svnmerge from 
http://svn.macports.org/repository/macports/trunk/base

........
  r31411 | nox at macports.org | 2007-11-22 13:39:49 -0400 (Thu, 22 Nov 2007) | 6 lines
  
  portmain.tcl:
   * Now uses {{{eval}}} in the default universal variant to flatten the
     different configure arguments. If we don't do that, we end up with
     something like "-O2 {-isysroot ...}", which we need to manually
     {{{join}}} to use it in a {{{system}}} call (e.g. in unrar port).
........

Modified Paths:
--------------
    branches/release_1_6/base/src/port1.0/portmain.tcl

Property Changed:
----------------
    branches/release_1_6/base/


Property changes on: branches/release_1_6/base
___________________________________________________________________
Name: svnmerge-integrated
   - /trunk/base:1-31405
   + /trunk/base:1-31413

Modified: branches/release_1_6/base/src/port1.0/portmain.tcl
===================================================================
--- branches/release_1_6/base/src/port1.0/portmain.tcl	2007-11-22 18:21:42 UTC (rev 31413)
+++ branches/release_1_6/base/src/port1.0/portmain.tcl	2007-11-22 18:32:27 UTC (rev 31414)
@@ -105,14 +105,14 @@
         if {[tbool use_xmkmf] || ![tbool use_configure]} {
             return -code error "Default universal variant only works with ports based on configure"
         }
-        configure.args-append ${configure.universal_args}
+        eval configure.args-append ${configure.universal_args}
         if {![file exists /Developer/SDKs/MacOSX10.4u.sdk/]} {
             return -code error "MacOS X 10.4 universal SDK is not installed (are we running on 10.3? did you forget to install it?) and building with +universal will very likely fail"
         }
-        configure.cflags-append ${configure.universal_cflags}
-        configure.cppflags-append ${configure.universal_cppflags}
-        configure.cxxflags-append ${configure.universal_cxxflags}
-        configure.ldflags-append ${configure.universal_ldflags}
+        eval configure.cflags-append ${configure.universal_cflags}
+        eval configure.cppflags-append ${configure.universal_cppflags}
+        eval configure.cxxflags-append ${configure.universal_cxxflags}
+        eval configure.ldflags-append ${configure.universal_ldflags}
     }
 
     # This is not a standard option, because we need to take an action when it's

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20071122/392e8488/attachment-0001.html