[82192] branches/release_2_0/base
afb at macports.org
afb at macports.org
Wed Aug 10 01:41:30 PDT 2011
Revision: 82192
http://trac.macports.org/changeset/82192
Author: afb at macports.org
Date: 2011-08-10 01:41:30 -0700 (Wed, 10 Aug 2011)
Log Message:
-----------
merge r82135 from trunk:
fix the arch of deb packages
Revision Links:
--------------
http://trac.macports.org/changeset/82135
Modified Paths:
--------------
branches/release_2_0/base/src/package1.0/portdpkg.tcl
Property Changed:
----------------
branches/release_2_0/base/
Property changes on: branches/release_2_0/base
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/gsoc08-privileges/base:37343-46937
/branches/gsoc09-logging/base:51231-60371
/branches/universal-sanity/base:51872-52323
/branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base:79584,79586,79590-79594,79599-79600,79649,79686,79689,79692,79750,79762,79771-79774,79782,79787,79864,79943,80069,80088,80178,80220,80222,80224,80226,80229,80287,80335,80443,80581,80583,80586,80779,80797-80798,80894,80928,80932,80934,80969,80971,81119,81146,81171,81234,81269,81361,81371,81414-81415,81454,81464,81467,81475,81522,81557-81558,81562,81565,81567,81577
/users/perry/base-bugs_and_notes:45682-46060
/users/perry/base-select:44044-44692
+ /branches/gsoc08-privileges/base:37343-46937
/branches/gsoc09-logging/base:51231-60371
/branches/universal-sanity/base:51872-52323
/branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base:79584,79586,79590-79594,79599-79600,79649,79686,79689,79692,79750,79762,79771-79774,79782,79787,79864,79943,80069,80088,80178,80220,80222,80224,80226,80229,80287,80335,80443,80581,80583,80586,80779,80797-80798,80894,80928,80932,80934,80969,80971,81119,81146,81171,81234,81269,81361,81371,81414-81415,81454,81464,81467,81475,81522,81557-81558,81562,81565,81567,81577,82135
/users/perry/base-bugs_and_notes:45682-46060
/users/perry/base-select:44044-44692
Modified: branches/release_2_0/base/src/package1.0/portdpkg.tcl
===================================================================
--- branches/release_2_0/base/src/package1.0/portdpkg.tcl 2011-08-10 08:37:03 UTC (rev 82191)
+++ branches/release_2_0/base/src/package1.0/portdpkg.tcl 2011-08-10 08:41:30 UTC (rev 82192)
@@ -53,7 +53,7 @@
set_ui_prefix
proc portdpkg::main {args} {
- global UI_PREFIX destpath os.arch os.platform
+ global UI_PREFIX destpath os.arch os.platform supported_archs configure.build_arch
ui_msg "$UI_PREFIX [format [msgcat::mc "Creating dpkg for %s-%s"] [option subport] [option version]]"
@@ -131,8 +131,9 @@
# sparc and sparc64. The operating system, os, is one of: linux, gnu,
# freebsd and openbsd. Use of gnu in this string is reserved for the
# GNU/Hurd operating system.
- switch -regex ${os.arch} {
+ switch -regex ${configure.build_arch} {
i[3-9]86 { set pkg_arch "i386" }
+ x86_64 { set pkg_arch "x86_64" }
default { set pkg_arch ${os.arch} }
}
@@ -140,7 +141,14 @@
# the operating system name
if {${os.platform} != "linux"} {
set pkg_arch "${os.platform}-${pkg_arch}"
+ } elseif {${pkg_arch} == "x86_64"} {
+ set pkg_arch "amd64"
}
+
+ # An architecture-independent package
+ if {$supported_archs == "noarch"} {
+ set pkg_arch "all"
+ }
puts $controlfd "Package: [option subport]"
puts $controlfd "Architecture: ${pkg_arch}"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110810/bf163b57/attachment.html>
More information about the macports-changes
mailing list