diff options
author | Scott James Remnant <scott@netsplit.com> | 2005-03-18 16:21:32 +0000 |
---|---|---|
committer | Scott James Remnant <scott@netsplit.com> | 2005-03-18 16:21:32 +0000 |
commit | 00e5640a99be03aba40c9e08a663b90d8f8aa797 (patch) | |
tree | f2b69382011851aa321df38f8669220675c34617 /m4 | |
parent | 841a630143cd3a35dbf8bce0a111ebd39dd12f44 (diff) | |
download | dpkg-00e5640a99be03aba40c9e08a663b90d8f8aa797.tar.gz |
dpkg (1.13.2) experimental; urgency=low
* md5sum has been removed, the coreutils or textutils version will be
diverted to /usr/bin/md5sum. Closes: #6633, #136110.
The following bugs are filed against the dpkg md5sum, so no longer apply.
Closes: #95755, #193877, #223381, #264195, #270241, #286632,
* Take Replaces into account when installing packages; don't issue a
"trying to overwrite" error if the file that already exists is in
a package that Replaces the one being installed.
Closes: #164595, #184635, #277890.
* Allow actions and status changes to be logged to a file. Disabled by
default, uncomment line in /etc/dpkg/dpkg.cfg to enable.
Closes: #957, #53376, #77109, #143882, #284499.
* Don't truncate output of 'dpkg -l' when stdout is not a tty.
Closes: #92263, #253860, #258608, #261822, #282790.
* Fix further compilation problems with gcc 4.0. Closes: #299699
* Handle tar files without trailing slash in directory names.
Closes: #287152.
* Output arguments to maintainer scripts with -D2. Closes: #237684,
#296030.
* Architecture Support:
- Added ppc64. Closes: #263743.
- Split archtable into cputable and ostable, archtable is retained
for compatibility with other packages that might use it only.
- dpkg-architecture no longer canonises -t argument. Closes: #173205.
- dpkg-architecture output includes new DEB_*_ARCH_OS and
DEB_*_ARCH_CPU variables that contain the Debian system and CPU
names respectively.
- dpkg-architecture outputs (mostly) correct GNU system names now,
in particular this means that it will output "linux-gnu" instead
of "linux". You should use the new _ARCH_OS variables instead.
* Documentation:
- Add examples to dpkg-divert(8). Closes: #291816.
- Correct typo in dpkg-architecture(1). Closes: #299090.
-- Scott James Remnant <scott@netsplit.com> Fri, 18 Mar 2005 16:21:32 +0000
Diffstat (limited to 'm4')
-rw-r--r-- | m4/arch.m4 | 101 |
1 files changed, 32 insertions, 69 deletions
diff --git a/m4/arch.m4 b/m4/arch.m4 index f91686f4f..a27ef4ac2 100644 --- a/m4/arch.m4 +++ b/m4/arch.m4 @@ -1,90 +1,53 @@ # DPKG_CPU_TYPE # ------------- -# Parse the target cpu name and check it against a list of special cases to -# determine what type it is. +# Parse the target cpu name and check it against the cputable to determine +# the Debian name for it. Sets ARCHITECTURE_CPU. AC_DEFUN([DPKG_CPU_TYPE], -[AC_MSG_CHECKING([cpu type]) -case "$target_cpu" in - i386|i486|i586|i686|pentium) - cpu_type="i386" - ;; - alpha*) - cpu_type="alpha" - ;; - arm*) - cpu_type="arm" - ;; - hppa*) - cpu_type="hppa" - ;; - sparc|sparc64) - cpu_type="sparc" - ;; - mips|mipseb) - cpu_type="mips" - ;; - powerpc|ppc) - cpu_type="powerpc" - ;; - *) +[AC_MSG_CHECKING([dpkg cpu type]) +[cpu_type="`awk \"! /^(#.*)?\\$/ { if (match(\\\"$target_cpu\\\", \\\"^\\\"\\$][3\\\"\\$\\\")) { print \\$][1; exit; } }\" $srcdir/cputable`"] +if test "x$cpu_type" = "x"; then cpu_type=$target_cpu - ;; -esac -AC_MSG_RESULT([$cpu_type]) + AC_MSG_RESULT([$cpu_type]) + AC_MSG_WARN([$target_cpu not found in cputable]) +else + AC_MSG_RESULT([$cpu_type]) +fi +AC_DEFINE_UNQUOTED(ARCHITECTURE_CPU, "${cpu_type}", + [Set this to the canonical dpkg CPU name.]) ])# DPKG_CPU_TYPE # DPKG_OS_TYPE # ------------ # Parse the target operating system name and check it against a list of -# special cases to determine what type it is. +# special cases to determine what type it is. Sets ARCHITECTURE_OS. AC_DEFUN([DPKG_OS_TYPE], -[AC_MSG_CHECKING([operating system type]) -case "$target_os" in - linux*-gnu*) - os_type="linux" - ;; - darwin*) - os_type="darwin" - ;; - freebsd*) - os_type="freebsd" - ;; - gnu*) - os_type="gnu" - ;; - kfreebsd*-gnu*) - os_type="kfreebsd-gnu" - ;; - knetbsd*-gnu*) - os_type="knetbsd-gnu" - ;; - netbsd*) - os_type="netbsd" - ;; - openbsd*) - os_type="openbsd" - ;; - *) +[AC_MSG_CHECKING([dpkg operating system type]) +[os_type="`awk \"! /^(#.*)?\\$/ { if (match(\\\"$target_os\\\", \\\"^\\\"\\$][3\\\"\\$\\\")) { print \\$][1; exit; } }\" $srcdir/ostable`"] +if test "x$os_type" = "x"; then os_type=$target_os - ;; -esac -AC_MSG_RESULT([$os_type]) + AC_MSG_RESULT([$os_type]) + AC_MSG_WARN([$target_os not found in ostable]) +else + AC_MSG_RESULT([$os_type]) +fi +AC_DEFINE_UNQUOTED(ARCHITECTURE_OS, "${os_type}", + [Set this to the canonical dpkg system name.]) ])# DPKG_OS_TYPE # DPKG_ARCHITECTURE # ------------------------ -# Locate the target operating system in the archtable, sets ARCHITECTURE +# Determine the Debian name for the target operating system, +# sets ARCHITECTURE. AC_DEFUN([DPKG_ARCHITECTURE], [DPKG_CPU_TYPE DPKG_OS_TYPE -AC_MSG_CHECKING([Debian architecture name]) -dpkg_archset="`awk '[$]1 == "'$cpu_type-$os_type'" { print [$]2 }' $srcdir/archtable`" -if test "x$dpkg_archset" = "x"; then - dpkg_archset=$cpu_type-$os_type - AC_MSG_RESULT([$dpkg_archset, but not found in archtable]) +AC_MSG_CHECKING([dpkg architecture name]) +if test "x$os_type" = "xlinux"; then + dpkg_arch=$cpu_type else - AC_MSG_RESULT([$dpkg_archset]) + dpkg_arch="$os_type-$cpu_type" fi -AC_DEFINE_UNQUOTED(ARCHITECTURE, "${dpkg_archset}", - [Set this to the canonical Debian architecture string for this CPU type.]) +AC_MSG_RESULT([$dpkg_arch]) +AC_DEFINE_UNQUOTED(ARCHITECTURE, "${dpkg_arch}", + [Set this to the canonical dpkg architecture name.]) ])# DPKG_ARCHITECTURE |