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

[source_changes at macosforge.org]

Revision: 30396
          http://trac.macosforge.org/projects/macports/changeset/30396
Author:   eridius at macports.org
Date:     2007-10-26 08:55:08 -0700 (Fri, 26 Oct 2007)

Log Message:
-----------
Remove configure.macosx_deployment_target, create global option macosx_deployment_target (autoconf doesn't generally preserve MACOSX_DEPLOYMENT_TARGET so we need the env var for the build phase too)

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

Modified: trunk/base/src/port1.0/portconfigure.tcl
===================================================================
--- trunk/base/src/port1.0/portconfigure.tcl	2007-10-26 15:47:43 UTC (rev 30395)
+++ trunk/base/src/port1.0/portconfigure.tcl	2007-10-26 15:55:08 UTC (rev 30396)
@@ -53,7 +53,7 @@
 default use_configure yes
 
 # Configure special environment variables.
-options configure.cflags configure.cppflags configure.cxxflags configure.objcflags configure.ldflags configure.libs configure.fflags configure.f90flags configure.fcflags configure.classpath configure.macosx_deployment_target configure.perl configure.python configure.ruby configure.install
+options configure.cflags configure.cppflags configure.cxxflags configure.objcflags configure.ldflags configure.libs configure.fflags configure.f90flags configure.fcflags configure.classpath configure.perl configure.python configure.ruby configure.install
 # We could have default debug/optimization flags at some point.
 default configure.pipe		no
 default configure.cflags	{-O2}
@@ -66,7 +66,6 @@
 default configure.f90flags	{-O2}
 default configure.fcflags	{-O2}
 default configure.classpath	{}
-default configure.macosx_deployment_target	{}
 default configure.perl		{}
 default configure.python	{}
 default configure.ruby		{}
@@ -135,7 +134,7 @@
 proc configure_main {args} {
     global [info globals]
     global worksrcpath use_configure use_autoconf use_automake use_xmkmf
-    global configure.env configure.pipe configure.cflags configure.cppflags configure.cxxflags configure.objcflags configure.ldflags configure.libs configure.fflags configure.f90flags configure.fcflags configure.classpath configure.macosx_deployment_target configure.perl configure.python configure.ruby configure.install
+    global configure.env configure.pipe configure.cflags configure.cppflags configure.cxxflags configure.objcflags configure.ldflags configure.libs configure.fflags configure.f90flags configure.fcflags configure.classpath configure.perl configure.python configure.ruby configure.install
     global configure.ccache configure.distcc configure.cc configure.cxx configure.cpp configure.objc configure.f77 configure.f90 configure.fc configure.javac configure.compiler prefix
     global os.platform os.major
     
@@ -286,7 +285,6 @@
 		append_list_to_environment_value configure "F90FLAGS" ${output}${configure.f90flags}
 		append_list_to_environment_value configure "FCFLAGS" ${output}${configure.fcflags}
 		append_list_to_environment_value configure "CLASSPATH" ${configure.classpath}
-		append_list_to_environment_value configure "MACOSX_DEPLOYMENT_TARGET" ${configure.macosx_deployment_target}
 		append_list_to_environment_value configure "PERL" ${configure.perl}
 		append_list_to_environment_value configure "PYTHON" ${configure.python}
 		append_list_to_environment_value configure "RUBY" ${configure.ruby}

Modified: trunk/base/src/port1.0/portmain.tcl
===================================================================
--- trunk/base/src/port1.0/portmain.tcl	2007-10-26 15:47:43 UTC (rev 30395)
+++ trunk/base/src/port1.0/portmain.tcl	2007-10-26 15:55:08 UTC (rev 30396)
@@ -42,7 +42,7 @@
 # define options
 options prefix name version revision epoch categories maintainers
 options long_description description homepage
-options worksrcdir filesdir distname portdbpath libpath distpath sources_conf os.platform os.version os.major os.arch os.endian platforms default_variants install.user install.group
+options worksrcdir filesdir distname portdbpath libpath distpath sources_conf os.platform os.version os.major os.arch os.endian platforms default_variants install.user install.group macosx_deployment_target
 
 # Export options via PortInfo
 options_export name version revision epoch categories maintainers platforms description long_description homepage
@@ -73,6 +73,8 @@
 default install.user {${portutil::autoconf::install_user}}
 default install.group {${portutil::autoconf::install_group}}
 
+default macosx_deployment_target {}
+
 # Compatibility namespace
 default portname {$name}
 default portversion {$version}

Modified: trunk/base/src/port1.0/portutil.tcl
===================================================================
--- trunk/base/src/port1.0/portutil.tcl	2007-10-26 15:47:43 UTC (rev 30395)
+++ trunk/base/src/port1.0/portutil.tcl	2007-10-26 15:55:08 UTC (rev 30396)
@@ -273,6 +273,9 @@
 	if {![array exists ${command}.env_array]} {
 		parse_environment ${command}
 	}
+	if {[option macosx_deployment_target] ne ""} {
+    	append_list_to_environment_value ${command} "MACOSX_DEPLOYMENT_TARGET" [option macosx_deployment_target]
+	}
 	
 	# Debug that.
     ui_debug "Environment: [environment_array_to_string ${command}.env_array]"

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