[58977] trunk/base/src/package1.0

[snc at macports.org]

Revision: 58977
          http://trac.macports.org/changeset/58977
Author:   snc at macports.org
Date:     2009-10-07 20:09:18 -0700 (Wed, 07 Oct 2009)
Log Message:
-----------
use build_arch in archivemode heirarchy instead of os.arch. this will differentiate between i386 and x86_64

Modified Paths:
--------------
    trunk/base/src/package1.0/portarchive.tcl
    trunk/base/src/package1.0/portunarchive.tcl

Modified: trunk/base/src/package1.0/portarchive.tcl
===================================================================
--- trunk/base/src/package1.0/portarchive.tcl	2009-10-08 00:53:57 UTC (rev 58976)
+++ trunk/base/src/package1.0/portarchive.tcl	2009-10-08 03:09:18 UTC (rev 58977)
@@ -70,6 +70,7 @@
 	global name version revision portvariants
 	global archive.destpath archive.type archive.meta
 	global archive.file archive.path archive.fulldestpath
+    global configure.build_arch
 
 	# Check mode in case archive called directly by user
 	if {[option portarchivemode] != "yes"} {
@@ -90,7 +91,7 @@
 
 	# Define archive destination directory and target filename
 	if {![string equal ${archive.destpath} ${workpath}] && ![string equal ${archive.destpath} ""]} {
-		set archive.fulldestpath [file join ${archive.destpath} [option os.platform] [option os.arch]]
+		set archive.fulldestpath [file join ${archive.destpath} [option os.platform] ${configure.build_arch}]
 	} else {
 	    set archive.fulldestpath ${archive.destpath}
 	}
@@ -299,7 +300,7 @@
 	global name epoch version revision portvariants
 	global archive.fulldestpath archive.type archive.file archive.path
 	global archive.meta archive.metaname archive.metapath
-	global os.platform os.arch
+	global os.platform os.arch configure.build_arch
 
 	# Create archive destination path (if needed)
 	if {![file isdirectory ${archive.fulldestpath}]} {
@@ -463,7 +464,7 @@
 	foreach archive.type [option portarchivetype] {
 		if {[catch {archiveTypeIsSupported ${archive.type}} errmsg] == 0} {
 			# Define archive file/path
-			set archive.file "${name}-${version}_${revision}${portvariants}.[option os.arch].${archive.type}"
+			set archive.file "${name}-${version}_${revision}${portvariants}.${configure.build_arch}.${archive.type}"
 			set archive.path "[file join ${archive.fulldestpath} ${archive.file}]"
 
 			# Setup archive command

Modified: trunk/base/src/package1.0/portunarchive.tcl
===================================================================
--- trunk/base/src/package1.0/portunarchive.tcl	2009-10-08 00:53:57 UTC (rev 58976)
+++ trunk/base/src/package1.0/portunarchive.tcl	2009-10-08 03:09:18 UTC (rev 58977)
@@ -65,6 +65,7 @@
 	global ports_force ports_source_only ports_binary_only
 	global name version revision portvariants portpath
 	global unarchive.srcpath unarchive.type unarchive.file unarchive.path unarchive.fullsrcpath
+    global configure.build_arch
 
 	# Check mode in case archive called directly by user
 	if {[option portarchivemode] != "yes"} {
@@ -85,7 +86,7 @@
 
 	# Define archive directory, file, and path
 	if {![string equal ${unarchive.srcpath} ${workpath}] && ![string equal ${unarchive.srcpath} ""]} {
-		set unarchive.fullsrcpath [file join ${unarchive.srcpath} [option os.platform] [option os.arch]]
+		set unarchive.fullsrcpath [file join ${unarchive.srcpath} [option os.platform] ${configure.build_arch}]
 	} else {
 	    set unarchive.fullsrcpath ${unarchive.srcpath}
 	}
@@ -108,7 +109,7 @@
 		set unsupported 0
 		foreach unarchive.type [option portarchivetype] {
 			if {[catch {archiveTypeIsSupported ${unarchive.type}} errmsg] == 0} {
-				set unarchive.file "${name}-${version}_${revision}${portvariants}.[option os.arch].${unarchive.type}"
+				set unarchive.file "${name}-${version}_${revision}${portvariants}.${configure.build_arch}.${unarchive.type}"
 				set unarchive.path "[file join ${unarchive.fullsrcpath} ${unarchive.file}]"
 				if {[file exist ${unarchive.path}]} {
 					set found 1
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20091007/de44eeea/attachment.html>