Changeset 82135

Timestamp:

08/08/11 07:30:17 (4 years ago)

Author:

afb@…

Message:

fix the arch of deb packages

File:

• trunk/base/src/package1.0/portdpkg.tcl (modified) (3 diffs)

trunk/base/src/package1.0/portdpkg.tcl

@@ -54 +54 @@
 
 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]]"
@@ -132 +132 @@
         # 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} }
         }
@@ -141 +142 @@
         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"
         }