Bug#118910: update for experimental
Hi,
I'm sending an update of this patch for dpkg 1.13.0 (in experimental).
--
.''`. Proudly running Debian GNU/kFreeBSD unstable/unreleased (on UFS2+S)
: :' :
`. `' http://www.debian.org/ports/kfreebsd-gnu
`-
--- dpkg-1.13.0.old/m4/arch.m4 2005-01-10 02:45:59.000000000 +0100
+++ dpkg-1.13.0/m4/arch.m4 2005-01-16 06:12:19.000000000 +0100
@@ -3,30 +3,89 @@
# Parse the target operating system name to determine what type it is
AC_DEFUN([DPKG_OS_TYPE],
[AC_MSG_CHECKING([operating system type])
+case "$target_cpu" in
+ alpha*)
+ cpu_type="alpha"
+ ;;
+ arm*)
+ cpu_type="arm"
+ ;;
+ hppa*)
+ cpu_type="hppa"
+ ;;
+ ia64)
+ cpu_type="ia64"
+ ;;
+ i386|i486|i586|i686|pentium)
+ cpu_type="i386"
+ ;;
+ sparc|sparc64)
+ cpu_type="sparc"
+ ;;
+ m68k)
+ cpu_type="m68k"
+ ;;
+ mips|mipseb)
+ cpu_type="mipseb"
+ ;;
+ mipsel)
+ cpu_type="mipsel"
+ ;;
+ powerpc|ppc)
+ cpu_type="powerpc"
+ ;;
+ powerpc64)
+ cpu_type="powerpc64"
+ ;;
+ s390)
+ cpu_type="s390"
+ ;;
+ s390x)
+ cpu_type="s390x"
+ ;;
+ sh3)
+ cpu_type="sh3"
+ ;;
+ sh3eb)
+ cpu_type="sh3eb"
+ ;;
+ sh4)
+ cpu_type="sh4"
+ ;;
+ sh4eb)
+ cpu_type="sh4eb"
+ ;;
+ x86_64)
+ cpu_type="x86_64"
+ ;;
+esac
case "$target_os" in
- *linux*)
- os_type="linux-gnu"
+ linux*-gnu*)
+ os_type="linux"
;;
- *openbsd*)
+ openbsd*)
os_type="openbsd"
;;
- *knetbsd*-gnu*)
+ knetbsd*-gnu)
os_type="knetbsd-gnu"
;;
- *netbsd*)
+ netbsd*)
os_type="netbsd"
;;
- *kfreebsd*-gnu*)
+ kfreebsd*-gnu)
os_type="kfreebsd-gnu"
;;
- *freebsd*)
+ freebsd*)
os_type="freebsd"
;;
- *)
- os_type=$target_os
+ gnu*)
+ os_type="gnu"
+ ;;
+ darwin*)
+ os_type="darwin"
;;
esac
-AC_MSG_RESULT([$os_type])
+AC_MSG_RESULT([$cpu_type-$os_type])
])# DPKG_OS_TYPE
# DPKG_ARCHITECTURE
@@ -35,9 +94,9 @@
AC_DEFUN([DPKG_ARCHITECTURE],
[DPKG_OS_TYPE
AC_MSG_CHECKING([Debian architecture name])
-dpkg_archset="`awk '[$]1 == "'$target_cpu-$os_type'" { print [$]2 }' $srcdir/archtable`"
+dpkg_archset="`awk '[$]1 == "'$cpu_type-$os_type'" { print [$]2 }' $srcdir/archtable`"
if test "x$dpkg_archset" = "x"; then
- dpkg_archset=$target_cpu-$os_type
+ dpkg_archset=$cpu_type-$os_type
AC_MSG_RESULT([$dpkg_archset, but not found in archtable])
else
AC_MSG_RESULT([$dpkg_archset])
--- dpkg-1.13.0.old/archtable 2005-01-10 03:36:41.000000000 +0100
+++ dpkg-1.13.0/archtable 2005-01-15 20:05:11.000000000 +0100
@@ -7,60 +7,29 @@
# returned by `dpkg --print-installation-architecture'.
# Column 3 is returned by `dpkg --print-architecture'.
-i386-linux-gnu i386 i486
-i486-linux-gnu i386 i486
-i586-linux-gnu i386 i486
-i686-linux-gnu i386 i486
-pentium-linux-gnu i386 i486
-sparc-linux-gnu sparc sparc
-sparc64-linux-gnu sparc sparc
-alpha-linux-gnu alpha alpha
-alphaev4-linux-gnu alpha alpha
-alphaev5-linux-gnu alpha alpha
-alphaev56-linux-gnu alpha alpha
-alphapca56-linux-gnu alpha alpha
-alphaev6-linux-gnu alpha alpha
-alphaev67-linux-gnu alpha alpha
-alphaev68-linux-gnu alpha alpha
-m68k-linux-gnu m68k m68k
-arm-linux-gnu arm arm
-armv3l-linux-gnu arm arm
-armv4l-linux-gnu arm arm
-ppc-linux-gnu powerpc powerpc
-powerpc-linux-gnu powerpc powerpc
-powerpc powerpc powerpc
-mips-linux-gnu mips mips
-mipsel-linux-gnu mipsel mipsel
-mipseb-linux-gnu mips mips
+i386-linux i386 i486
+sparc-linux sparc sparc
+alpha-linux alpha alpha
+m68k-linux m68k m68k
+arm-linux arm arm
+powerpc-linux powerpc powerpc
+powerpc64-linux powerpc64 powerpc64
+mipseb-linux mips mips
+mipsel-linux mipsel mipsel
i386-gnu hurd-i386 undefined
-i386-gnu0.2 hurd-i386 undefined
-i386-gnu0.3 hurd-i386 undefined
-i486-gnu0.3 hurd-i386 undefined
-i586-gnu0.3 hurd-i386 undefined
-i686-gnu0.3 hurd-i386 undefined
-ia64-linux-gnu ia64 ia64
-ia64-unknown-linux ia64 ia64
-ia64-unknown-linux-gnu ia64 ia64
-x86_64-linux-gnu amd64 x86_64
-sh3-linux-gnu sh3 sh3
-sh4-linux-gnu sh4 sh4
-sh3eb-linux-gnu sh3eb sh3eb
-sh4eb-linux-gnu sh4eb sh4eb
-hppa-linux-gnu hppa hppa
-hppa1.1-linux-gnu hppa hppa
-hppa2.0-linux-gnu hppa hppa
-hppa64-linux-gnu hppa hppa
+ia64-linux ia64 ia64
+x86_64-linux amd64 x86_64
+sh3-linux sh3 sh3
+sh4-linux sh4 sh4
+sh3eb-linux sh3eb sh3eb
+sh4eb-linux sh4eb sh4eb
+hppa-linux hppa hppa
i386-freebsd freebsd-i386 freebsd-i386
i386-kfreebsd-gnu kfreebsd-i386 kfreebsd-i386
i386-netbsdelf-gnu netbsd-i386 netbsd-i386
i386-knetbsd-gnu knetbsd-i386 knetbsd-i386
-s390-linux-gnu s390 s390
-s390-ibm-linux-gnu s390 s390
-s390-unknown-linux-gnu s390 s390
+s390-linux s390 s390
i386-openbsd openbsd-i386 openbsd-i386
-i386-unknown-openbsd openbsd-i386 openbsd-i386
powerpc-darwin darwin-powerpc darwin-powerpc
i386-darwin darwin-i386 darwin-i386
-s390x-linux-gnu s390x s390x
-s390x-ibm-linux-gnu s390x s390x
-s390x-unknown-linux-gnu s390x s390x
+s390x-linux s390x s390x
Reply to: