[33724] trunk/base/src

afb at macports.org afb at macports.org
Mon Feb 4 00:29:18 PST 2008


Revision: 33724
          http://trac.macosforge.org/projects/macports/changeset/33724
Author:   afb at macports.org
Date:     2008-02-04 00:29:16 -0800 (Mon, 04 Feb 2008)

Log Message:
-----------
read universal configuration from macports.conf

Modified Paths:
--------------
    trunk/base/src/macports1.0/macports.tcl
    trunk/base/src/port1.0/portconfigure.tcl

Modified: trunk/base/src/macports1.0/macports.tcl
===================================================================
--- trunk/base/src/macports1.0/macports.tcl	2008-02-04 03:30:08 UTC (rev 33723)
+++ trunk/base/src/macports1.0/macports.tcl	2008-02-04 08:29:16 UTC (rev 33724)
@@ -44,7 +44,8 @@
         portinstalltype portarchivemode portarchivepath portarchivetype portautoclean \
         porttrace portverbose destroot_umask variants_conf rsync_server rsync_options \
         rsync_dir startupitem_type place_worksymlink xcodeversion xcodebuildcmd \
-        mp_remote_url mp_remote_submit_url configureccache configuredistcc configurepipe buildnicevalue buildmakejobs"
+        mp_remote_url mp_remote_submit_url configureccache configuredistcc configurepipe buildnicevalue buildmakejobs \
+        universal_target universal_sysroot universal_archs"
     variable user_options "submitter_name submitter_email submitter_key"
     variable portinterp_options "\
         portdbpath portpath portbuildpath auto_path prefix prefix_frozen x11prefix portsharepath \
@@ -52,7 +53,7 @@
         portarchivetype portautoclean porttrace portverbose destroot_umask rsync_server \
         rsync_options rsync_dir startupitem_type place_worksymlink \
         mp_remote_url mp_remote_submit_url configureccache configuredistcc configurepipe buildnicevalue buildmakejobs \
-        $user_options"
+        universal_target universal_sysroot universal_archs $user_options"
     
     # deferred options are only computed when needed.
     # they are not exported to the trace thread.
@@ -333,6 +334,9 @@
     global macports::configurepipe
     global macports::buildnicevalue
     global macports::buildmakejobs
+    global macports::universal_target
+    global macports::universal_sysroot
+    global macports::universal_archs
 
     # Set the system encoding to utf-8
     encoding system utf-8
@@ -625,6 +629,17 @@
     if {![info exists macports::buildmakejobs]} {
         set macports::buildmakejobs 1
     }
+
+    # Default mp universal options
+    if {![info exists macports::universal_target]} {
+        set macports::universal_target "10.4"
+    }
+    if {![info exists macports::universal_sysroot]} {
+        set macports::universal_sysroot "/Developer/SDKs/MacOSX10.4u.sdk"
+    }
+    if {![info exists macports::universal_archs]} {
+        set macports::universal_archs {ppc i386}
+    }
     
     # ENV cleanup.
     set keepenvkeys {

Modified: trunk/base/src/port1.0/portconfigure.tcl
===================================================================
--- trunk/base/src/port1.0/portconfigure.tcl	2008-02-04 03:30:08 UTC (rev 33723)
+++ trunk/base/src/port1.0/portconfigure.tcl	2008-02-04 08:29:16 UTC (rev 33724)
@@ -102,14 +102,9 @@
 default configure.pkg_config        {}
 default configure.pkg_config_path   {}
 
-# Universal options & default values.
-set target "10.4"
-set sysroot "/Developer/SDKs/MacOSX10.4u.sdk"
-set universal_archs {ppc i386}
-
 options configure.universal_target configure.universal_sysroot configure.universal_archs configure.universal_args configure.universal_cflags configure.universal_cppflags configure.universal_cxxflags configure.universal_ldflags
-default configure.universal_target      {${target}}
-default configure.universal_sysroot     {${sysroot}}
+default configure.universal_target      {${universal_target}}
+default configure.universal_sysroot     {${universal_sysroot}}
 default configure.universal_archs       {${universal_archs}}
 default configure.universal_args        {[configure_get_universal_args]}
 default configure.universal_cflags      {[configure_get_universal_cflags]}

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080204/03c73890/attachment-0001.html


More information about the macports-changes mailing list