Changeset 30396 for trunk/base


Ignore:
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:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/base/src/port1.0/portconfigure.tcl

    r30216 r30396  
    5454
    5555# Configure special environment variables.
    56 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
     56options 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
    5757# We could have default debug/optimization flags at some point.
    5858default configure.pipe          no
     
    6767default configure.fcflags       {-O2}
    6868default configure.classpath     {}
    69 default configure.macosx_deployment_target      {}
    7069default configure.perl          {}
    7170default configure.python        {}
     
    136135    global [info globals]
    137136    global worksrcpath use_configure use_autoconf use_automake use_xmkmf
    138     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
     137    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
    139138    global configure.ccache configure.distcc configure.cc configure.cxx configure.cpp configure.objc configure.f77 configure.f90 configure.fc configure.javac configure.compiler prefix
    140139    global os.platform os.major
     
    287286                append_list_to_environment_value configure "FCFLAGS" ${output}${configure.fcflags}
    288287                append_list_to_environment_value configure "CLASSPATH" ${configure.classpath}
    289                 append_list_to_environment_value configure "MACOSX_DEPLOYMENT_TARGET" ${configure.macosx_deployment_target}
    290288                append_list_to_environment_value configure "PERL" ${configure.perl}
    291289                append_list_to_environment_value configure "PYTHON" ${configure.python}
  • trunk/base/src/port1.0/portmain.tcl

    r30091 r30396  
    4343options prefix name version revision epoch categories maintainers
    4444options long_description description homepage
    45 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
     45options 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
    4646
    4747# Export options via PortInfo
     
    7373default install.user {${portutil::autoconf::install_user}}
    7474default install.group {${portutil::autoconf::install_group}}
     75
     76default macosx_deployment_target {}
    7577
    7678# Compatibility namespace
  • trunk/base/src/port1.0/portutil.tcl

    r30395 r30396  
    273273        if {![array exists ${command}.env_array]} {
    274274                parse_environment ${command}
     275        }
     276        if {[option macosx_deployment_target] ne ""} {
     277        append_list_to_environment_value ${command} "MACOSX_DEPLOYMENT_TARGET" [option macosx_deployment_target]
    275278        }
    276279       
Note: See TracChangeset for help on using the changeset viewer.