Changeset 30396

Timestamp:

Oct 26, 2007, 3:55:08 PM (12 years ago)

Author:

eridius@…

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)

Location:

trunk/base/src/port1.0

Files:

• portconfigure.tcl (modified) (4 diffs)
• portmain.tcl (modified) (2 diffs)
• portutil.tcl (modified) (1 diff)

trunk/base/src/port1.0/portconfigure.tcl

@@ -54 +54 @@
 
 # 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
@@ -67 +67 @@
 default configure.fcflags       {-O2}
 default configure.classpath     {}
-default configure.macosx_deployment_target      {}
 default configure.perl          {}
 default configure.python        {}
@@ -136 +135 @@
     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
@@ -287 +286 @@
                 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}

trunk/base/src/port1.0/portmain.tcl

@@ -43 +43 @@
 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
@@ -73 +73 @@
 default install.user {${portutil::autoconf::install_user}}
 default install.group {${portutil::autoconf::install_group}}
+
+default macosx_deployment_target {}
 
 # Compatibility namespace

trunk/base/src/port1.0/portutil.tcl

@@ -273 +273 @@
         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]
         }