Changeset 58977


Ignore:
Timestamp:
Oct 8, 2009, 3:09:18 AM (11 years ago)
Author:
snc@…
Message:

use build_arch in archivemode heirarchy instead of os.arch. this will differentiate between i386 and x86_64

Location:
trunk/base/src/package1.0
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/base/src/package1.0/portarchive.tcl

    r51849 r58977  
    7171        global archive.destpath archive.type archive.meta
    7272        global archive.file archive.path archive.fulldestpath
     73    global configure.build_arch
    7374
    7475        # Check mode in case archive called directly by user
     
    9192        # Define archive destination directory and target filename
    9293        if {![string equal ${archive.destpath} ${workpath}] && ![string equal ${archive.destpath} ""]} {
    93                 set archive.fulldestpath [file join ${archive.destpath} [option os.platform] [option os.arch]]
     94                set archive.fulldestpath [file join ${archive.destpath} [option os.platform] ${configure.build_arch}]
    9495        } else {
    9596            set archive.fulldestpath ${archive.destpath}
     
    300301        global archive.fulldestpath archive.type archive.file archive.path
    301302        global archive.meta archive.metaname archive.metapath
    302         global os.platform os.arch
     303        global os.platform os.arch configure.build_arch
    303304
    304305        # Create archive destination path (if needed)
     
    464465                if {[catch {archiveTypeIsSupported ${archive.type}} errmsg] == 0} {
    465466                        # Define archive file/path
    466                         set archive.file "${name}-${version}_${revision}${portvariants}.[option os.arch].${archive.type}"
     467                        set archive.file "${name}-${version}_${revision}${portvariants}.${configure.build_arch}.${archive.type}"
    467468                        set archive.path "[file join ${archive.fulldestpath} ${archive.file}]"
    468469
  • trunk/base/src/package1.0/portunarchive.tcl

    r51849 r58977  
    6666        global name version revision portvariants portpath
    6767        global unarchive.srcpath unarchive.type unarchive.file unarchive.path unarchive.fullsrcpath
     68    global configure.build_arch
    6869
    6970        # Check mode in case archive called directly by user
     
    8687        # Define archive directory, file, and path
    8788        if {![string equal ${unarchive.srcpath} ${workpath}] && ![string equal ${unarchive.srcpath} ""]} {
    88                 set unarchive.fullsrcpath [file join ${unarchive.srcpath} [option os.platform] [option os.arch]]
     89                set unarchive.fullsrcpath [file join ${unarchive.srcpath} [option os.platform] ${configure.build_arch}]
    8990        } else {
    9091            set unarchive.fullsrcpath ${unarchive.srcpath}
     
    109110                foreach unarchive.type [option portarchivetype] {
    110111                        if {[catch {archiveTypeIsSupported ${unarchive.type}} errmsg] == 0} {
    111                                 set unarchive.file "${name}-${version}_${revision}${portvariants}.[option os.arch].${unarchive.type}"
     112                                set unarchive.file "${name}-${version}_${revision}${portvariants}.${configure.build_arch}.${unarchive.type}"
    112113                                set unarchive.path "[file join ${unarchive.fullsrcpath} ${unarchive.file}]"
    113114                                if {[file exist ${unarchive.path}]} {
Note: See TracChangeset for help on using the changeset viewer.