[67764] branches/release_1_9/base/src/port1.0

[jmr at macports.org]

Revision: 67764
          http://trac.macports.org/changeset/67764
Author:   jmr at macports.org
Date:     2010-05-17 12:02:29 -0700 (Mon, 17 May 2010)
Log Message:
-----------
merge r67763 from trunk:
 instead of directly disabling the default universal variant based on use_configure being false, set the default value of universal_variant to $use_configure

Revision Links:
--------------
    http://trac.macports.org/changeset/67763

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

Modified: branches/release_1_9/base/src/port1.0/portmain.tcl
===================================================================
--- branches/release_1_9/base/src/port1.0/portmain.tcl	2010-05-17 18:26:05 UTC (rev 67763)
+++ branches/release_1_9/base/src/port1.0/portmain.tcl	2010-05-17 19:02:29 UTC (rev 67764)
@@ -100,7 +100,7 @@
 }
 ui_debug "OS [option os.platform]/[option os.version] ${macosx_version_text}arch [option os.arch]"
 
-default universal_variant yes
+default universal_variant {${use_configure}}
 
 # sub-platforms of darwin
 if {[option os.platform] == "darwin"} {

Modified: branches/release_1_9/base/src/port1.0/portutil.tcl
===================================================================
--- branches/release_1_9/base/src/port1.0/portutil.tcl	2010-05-17 18:26:05 UTC (rev 67763)
+++ branches/release_1_9/base/src/port1.0/portutil.tcl	2010-05-17 19:02:29 UTC (rev 67764)
@@ -1876,12 +1876,9 @@
     if {[variant_exists universal]} {
         ui_debug "universal variant already exists, so not adding the default one"
     } elseif {[exists universal_variant] && ![option universal_variant]} {
-        ui_debug "'universal_variant no' specified, so not adding the default universal variant"
+        ui_debug "universal_variant is false, so not adding the default universal variant"
     } elseif {[exists use_xmkmf] && [option use_xmkmf]} {
         ui_debug "using xmkmf, so not adding the default universal variant"
-    } elseif {[exists use_configure] && ![option use_configure] && ![exists xcode.project]} {
-        # Allow +universal if port uses xcode portgroup.
-        ui_debug "not using configure, so not adding the default universal variant"
     } elseif {![exists os.universal_supported] || ![option os.universal_supported]} {
         ui_debug "OS doesn't support universal builds, so not adding the default universal variant"
     } elseif {[llength [option supported_archs]] == 1} {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100517/80f06476/attachment-0001.html>