+2005-03-29 Scott James Remnant <scott@netsplit.com>
+
+ * configure.ac: Release 1.13.4.
+
+2005-03-28 Scott James Remnant <scott@netsplit.com>
+
+ * scripts/dpkg-architecture.pl: Catch -L and list every possible
+ os and cpu combination.
+ (usageversion): Add -L option to description.
+ (read_cputable): Add in-order list of cpu values to @cpu array.
+ (read_ostable): Add in-order list of os values to @os array.
+ * man/C/dpkg-architecture.1: Document -L option.
+
+2005-03-27 Scott James Remnant <scott@netsplit.com>
+
+ * m4/arch.m4 (DPKG_OS_TYPE): Allow a vendor to appear at the start
+ of $os_type.
+ * scripts/dpkg-architecture.pl (gnu_to_debian): Don't strip the
+ vendor out, just allow it to appear at the start of the string.
+
2005-03-21 Scott James Remnant <scott@netsplit.com>
+ * configure.ac: Bump version to 1.13.4~.
+
+ * configure.ac: Release 1.13.3.
+
* scripts/controllib.pl (unknown): Output field name we have in
hand, rather than trying to look it up in a dictionary in which
it doesn't exist yet.
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for dpkg 1.13.3.
+# Generated by GNU Autoconf 2.59 for dpkg 1.13.4.
#
# Report bugs to <debian-dpkg@lists.debian.org>.
#
# Identity of this package.
PACKAGE_NAME='dpkg'
PACKAGE_TARNAME='dpkg'
-PACKAGE_VERSION='1.13.3'
-PACKAGE_STRING='dpkg 1.13.3'
+PACKAGE_VERSION='1.13.4'
+PACKAGE_STRING='dpkg 1.13.4'
PACKAGE_BUGREPORT='debian-dpkg@lists.debian.org'
ac_unique_file="lib/dpkg.h"
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures dpkg 1.13.3 to adapt to many kinds of systems.
+\`configure' configures dpkg 1.13.4 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of dpkg 1.13.3:";;
+ short | recursive ) echo "Configuration of dpkg 1.13.4:";;
esac
cat <<\_ACEOF
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-dpkg configure 1.13.3
+dpkg configure 1.13.4
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by dpkg $as_me 1.13.3, which was
+It was created by dpkg $as_me 1.13.4, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
echo "$as_me:$LINENO: checking dpkg operating system type" >&5
echo $ECHO_N "checking dpkg operating system type... $ECHO_C" >&6
-os_type="`awk \"! /^(#.*)?\\$/ { if (match(\\\"$target_os\\\", \\\"^\\\"\\$3\\\"\\$\\\")) { print \\$1; exit; } }\" $srcdir/ostable`"
+os_type="`awk \"! /^(#.*)?\\$/ { if (match(\\\"$target_os\\\", \\\"^(.*-)?\\\"\\$3\\\"\\$\\\")) { print \\$1; exit; } }\" $srcdir/ostable`"
if test "x$os_type" = "x"; then
os_type=$target_os
echo "$as_me:$LINENO: result: $os_type" >&5
# Define the identity of the package.
PACKAGE='dpkg'
- VERSION='1.13.3'
+ VERSION='1.13.4'
cat >>confdefs.h <<_ACEOF
} >&5
cat >&5 <<_CSEOF
-This file was extended by dpkg $as_me 1.13.3, which was
+This file was extended by dpkg $as_me 1.13.4, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-dpkg config.status 1.13.3
+dpkg config.status 1.13.4
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.59)
-AC_INIT([dpkg], [1.13.3], [debian-dpkg@lists.debian.org])
+AC_INIT([dpkg], [1.13.4], [debian-dpkg@lists.debian.org])
AC_CONFIG_SRCDIR([lib/dpkg.h])
AC_CONFIG_MACRO_DIR([m4])
+dpkg (1.13.4) experimental; urgency=low
+
+ The "Or the Wabbit gets it" Release
+
+ * Add -L option to dpkg-architecture to list architecture strings
+ we can accept.
+
+ -- Scott James Remnant <scott@netsplit.com> Tue, 29 Mar 2005 13:31:15 +0100
+
dpkg (1.13.3) experimental; urgency=low
- The "Paying off Karma at a vastly acclerated rate" Release.
+ The "Paying off Karma at a vastly accelerated rate" Release.
* Missing newline added to warning output function. Closes: #283798.
* Fixed prototype warning in dpkg-scansources. Closes: #213577, #219760,
# special cases to determine what type it is. Sets ARCHITECTURE_OS.
AC_DEFUN([DPKG_OS_TYPE],
[AC_MSG_CHECKING([dpkg operating system type])
-[os_type="`awk \"! /^(#.*)?\\$/ { if (match(\\\"$target_os\\\", \\\"^\\\"\\$][3\\\"\\$\\\")) { print \\$][1; exit; } }\" $srcdir/ostable`"]
+[os_type="`awk \"! /^(#.*)?\\$/ { if (match(\\\"$target_os\\\", \\\"^(.*-)?\\\"\\$][3\\\"\\$\\\")) { print \\$][1; exit; } }\" $srcdir/ostable`"]
if test "x$os_type" = "x"; then
os_type=$target_os
AC_MSG_RESULT([$os_type])
\&\fB\-f\fR
.PP
Valid actions:
-\&\fB\-l\fR, \fB\-q\fRVariable\-Name, \fB\-s\fR, \fB\-u\fR, \fB\-c\fR Command
+\&\fB\-l\fR, \fB\-q\fRVariable\-Name, \fB\-s\fR, \fB\-u\fR, \fB\-c\fR Command,
+\fB\-L\fR
.SH "DESCRIPTION"
.IX Header "DESCRIPTION"
dpkg-architecture does provide a facility to determine and set the build and
command in an environment which has all variables set to the determined
value.
.PP
+A list of valid architecture names can be printed with the \fB\-L\fR action.
+.PP
Existing environment variables with the same name as used by the scripts are
not overwritten, except if the \fB\-f\fR force flag is present. This allows the user
to override a value even when the call to dpkg-architecture is buried in
Options:
-a<debian-arch> set Debian architecture
-t<gnu-system> set GNU system type
+ -L list valid architectures
-f force flag (override variables set in environment)
Actions:
-l list variables (default)
if (m/^(?!\#)(\S+)\s+(\S+)\s+(\S+)/) {
$cputable{$1} = $2;
$cputable_re{$1} = $3;
+ push @cpu, $1;
}
}
close CPUTABLE;
if (m/^(?!\#)(\S+)\s+(\S+)\s+(\S+)/) {
$ostable{$1} = $2;
$ostable_re{$1} = $3;
+ push @os, $1;
}
}
close OSTABLE;
sub split_gnu {
local ($_) = @_;
- # Nuke the vendor bit
- if (/^([^-]*)-([^-]*)-([^-]*-.*)/) {
- return ($1, $3);
- } else {
- /^([^-]*)-(.*)/;
- return ($1, $2);
- }
+ /^([^-]*)-(.*)/;
+ return ($1, $2);
}
sub gnu_to_debian {
}
foreach $a (keys %ostable_re) {
- if ($gnu_os =~ /^$ostable_re{$a}$/) {
+ if ($gnu_os =~ /^(.*-)?$ostable_re{$a}$/) {
$os = $a;
last;
}
&read_cputable;
&read_ostable;
+# Check for -L
+if (grep { m/^-L$/ } @ARGV) {
+ foreach $os (@os) {
+ foreach $cpu (@cpu) {
+ if ($os eq "linux") {
+ print "$cpu\n"
+ } else {
+ print "$os-$cpu\n";
+ }
+ }
+ }
+ exit unless $#ARGV;
+}
+
# Set default values:
chomp ($deb_build_arch = `dpkg --print-architecture`);
} elsif (m/^-c$/) {
$action = 'c';
last;
+ } elsif (m/^-L$/) {
+ # Handled already
} else {
usageerr("unknown option \`$_'");
}
projects / dpkg / commitdiff