[33107] trunk/base/src/port1.0

[afb at macports.org]

Revision: 33107
          http://trac.macosforge.org/projects/macports/changeset/33107
Author:   afb at macports.org
Date:     2008-01-18 00:25:43 -0800 (Fri, 18 Jan 2008)

Log Message:
-----------
go back to 10.4u SDK (and M_D_T=10.4) by default

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

Modified: trunk/base/src/port1.0/portconfigure.tcl
===================================================================
--- trunk/base/src/port1.0/portconfigure.tcl	2008-01-18 06:01:56 UTC (rev 33106)
+++ trunk/base/src/port1.0/portconfigure.tcl	2008-01-18 08:25:43 UTC (rev 33107)
@@ -79,11 +79,8 @@
 default configure.pkg_config_path   {}
 
 # Universal options & default values.
-if {[file exists /Developer/SDKs/MacOSX10.5.sdk]} {
-    set sysroot "/Developer/SDKs/MacOSX10.5.sdk"
-} else {
-    set sysroot "/Developer/SDKs/MacOSX10.4u.sdk"
-}
+set sysroot "/Developer/SDKs/MacOSX10.4u.sdk"
+
 options configure.universal_args configure.universal_cflags configure.universal_cppflags configure.universal_cxxflags configure.universal_ldflags
 default configure.universal_args        --disable-dependency-tracking
 default configure.universal_cflags      {[configure_get_universal_cflags]}

Modified: trunk/base/src/port1.0/portmain.tcl
===================================================================
--- trunk/base/src/port1.0/portmain.tcl	2008-01-18 06:01:56 UTC (rev 33106)
+++ trunk/base/src/port1.0/portmain.tcl	2008-01-18 08:25:43 UTC (rev 33107)
@@ -106,8 +106,7 @@
             return -code error "Default universal variant only works with ports based on configure"
         }
         eval configure.args-append ${configure.universal_args}
-        if {![file exists /Developer/SDKs/MacOSX10.4u.sdk] &&
-            ![file exists /Developer/SDKs/MacOSX10.5.sdk]} {
+        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"
         }
         eval configure.cflags-append ${configure.universal_cflags}
@@ -115,6 +114,10 @@
         eval configure.cxxflags-append ${configure.universal_cxxflags}
         eval configure.ldflags-append ${configure.universal_ldflags}
     }
+    if {[info exists variations(universal)] && $variations(universal) == "+"} {
+        # cannot go into the variant, due to the amount of ports overriding it
+        eval macosx_deployment_target "10.4"
+    }
 
     # This is not a standard option, because we need to take an action when it's
     # set, in order to alter the PortInfo structure in time.

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080118/a87370ca/attachment.html