[30089] trunk/base/src/port1.0/portmain.tcl
source_changes at macosforge.org
source_changes at macosforge.org
Fri Oct 19 05:32:14 PDT 2007
Revision: 30089
http://trac.macosforge.org/projects/macports/changeset/30089
Author: nox at macports.org
Date: 2007-10-19 05:32:13 -0700 (Fri, 19 Oct 2007)
Log Message:
-----------
*** empty log message ***
Modified Paths:
--------------
trunk/base/src/port1.0/portmain.tcl
Modified: trunk/base/src/port1.0/portmain.tcl
===================================================================
--- trunk/base/src/port1.0/portmain.tcl 2007-10-19 12:17:33 UTC (rev 30088)
+++ trunk/base/src/port1.0/portmain.tcl 2007-10-19 12:32:13 UTC (rev 30089)
@@ -98,28 +98,28 @@
if {[info exists os.platform] && (${os.platform} == "darwin") && ![file isdirectory /System/Library/Frameworks/Carbon.framework] && ![info exists variations(puredarwin)]} { variant_set puredarwin }
if {[info exists os.platform] && (${os.platform} == "darwin") && [file isdirectory /System/Library/Frameworks/Carbon.framework] && ![info exists variations(macosx)]} { variant_set macosx }
if {[info exists variations(macosx)] && $variations(macosx) == "+"} {
- # Declare default universal variant, on >10.3
- variant universal {
- 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}
- 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}
- }
+ # Declare default universal variant, on >10.3
+ variant universal {
+ 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}
+ 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}
+ }
- # 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.
- proc universal_variant {state} {
- if {${state} == "no"} {
- variant_undef universal
- }
- }
+ # 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.
+ proc universal_variant {state} {
+ if {${state} == "no"} {
+ variant_undef universal
+ }
+ }
}
proc main {args} {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20071019/e556b53b/attachment.html
More information about the macports-changes
mailing list