Changeset 33724


Ignore:
Timestamp:
Feb 4, 2008, 8:29:16 AM (12 years ago)
Author:
afb@…
Message:

read universal configuration from macports.conf

Location:
trunk/base/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/base/src/macports1.0/macports.tcl

    r33619 r33724  
    4545        porttrace portverbose destroot_umask variants_conf rsync_server rsync_options \
    4646        rsync_dir startupitem_type place_worksymlink xcodeversion xcodebuildcmd \
    47         mp_remote_url mp_remote_submit_url configureccache configuredistcc configurepipe buildnicevalue buildmakejobs"
     47        mp_remote_url mp_remote_submit_url configureccache configuredistcc configurepipe buildnicevalue buildmakejobs \
     48        universal_target universal_sysroot universal_archs"
    4849    variable user_options "submitter_name submitter_email submitter_key"
    4950    variable portinterp_options "\
     
    5354        rsync_options rsync_dir startupitem_type place_worksymlink \
    5455        mp_remote_url mp_remote_submit_url configureccache configuredistcc configurepipe buildnicevalue buildmakejobs \
    55         $user_options"
     56        universal_target universal_sysroot universal_archs $user_options"
    5657   
    5758    # deferred options are only computed when needed.
     
    334335    global macports::buildnicevalue
    335336    global macports::buildmakejobs
     337    global macports::universal_target
     338    global macports::universal_sysroot
     339    global macports::universal_archs
    336340
    337341    # Set the system encoding to utf-8
     
    625629    if {![info exists macports::buildmakejobs]} {
    626630        set macports::buildmakejobs 1
     631    }
     632
     633    # Default mp universal options
     634    if {![info exists macports::universal_target]} {
     635        set macports::universal_target "10.4"
     636    }
     637    if {![info exists macports::universal_sysroot]} {
     638        set macports::universal_sysroot "/Developer/SDKs/MacOSX10.4u.sdk"
     639    }
     640    if {![info exists macports::universal_archs]} {
     641        set macports::universal_archs {ppc i386}
    627642    }
    628643   
  • trunk/base/src/port1.0/portconfigure.tcl

    r33600 r33724  
    103103default configure.pkg_config_path   {}
    104104
    105 # Universal options & default values.
    106 set target "10.4"
    107 set sysroot "/Developer/SDKs/MacOSX10.4u.sdk"
    108 set universal_archs {ppc i386}
    109 
    110105options configure.universal_target configure.universal_sysroot configure.universal_archs configure.universal_args configure.universal_cflags configure.universal_cppflags configure.universal_cxxflags configure.universal_ldflags
    111 default configure.universal_target      {${target}}
    112 default configure.universal_sysroot     {${sysroot}}
     106default configure.universal_target      {${universal_target}}
     107default configure.universal_sysroot     {${universal_sysroot}}
    113108default configure.universal_archs       {${universal_archs}}
    114109default configure.universal_args        {[configure_get_universal_args]}
Note: See TracChangeset for help on using the changeset viewer.