Sorry about all the yelling and screaming this morning, I've been
having a few rather bad days. Computers suck :)
Anyway the patch to fix compiling with 2.96 is super-trivial, and of
course already in the head branch of CVS:
--- dpkg-1.6.14/dselect/main.cc Wed May 3 10:14:55 2000
+++ dpkg-1.6.91.20001005/dselect/main.cc Thu Oct 5 14:54:05 2000
@@ -117,7 +117,7 @@
setvbuf(debug,0,_IONBF,0);
}
- static void setexpert() {
+ static void setexpert(const struct cmdinfo*, const char *v) {
expertmode = 1;
}
Here are the rest of the hppa diffs for 1.6.14:
diff -urN dpkg-1.6.14/archtable dpkg-1.6.14.1/archtable
--- dpkg-1.6.14/archtable Sat Oct 23 14:27:02 1999
+++ dpkg-1.6.14.1/archtable Wed Oct 11 14:51:54 2000
@@ -34,3 +34,6 @@
mips mips mips
mipsel mipsel mipsel
mipseb mips mips
+hppa hppa hppa
+hppa1.1 hppa hppa
+hppa2.0 hppa hppa
diff -urN dpkg-1.6.14/config.guess dpkg-1.6.14.1/config.guess
--- dpkg-1.6.14/config.guess Tue Dec 14 18:58:29 1999
+++ dpkg-1.6.14.1/config.guess Wed Oct 11 14:52:50 2000
@@ -740,6 +851,22 @@
EOF
$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy
"${UNAME_MACHINE}" && rm $dummy.c $dummy && exit 0
rm -f $dummy.c $dummy
+ elif test "${UNAME_MACHINE}" = "s390"; then
+ echo s390-ibm-linux && exit 0
+ elif test "${UNAME_MACHINE}" = "parisc" -o "${UNAME_MACHINE}" = "hppa";
then
+ # Look for CPU level
+ case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2`
in
+ PA7*)
+ echo hppa1.1-unknown-linux-gnu
+ ;;
+ PA8*)
+ echo hppa2.0-unknown-linux-gnu
+ ;;
+ *)
+ echo hppa-unknown-linux-gnu
+ ;;
+ esac
+ exit 0;
else
# Either a pre-BFD a.out linker (linux-gnuoldld)
# or one that does not give us useful --help.
diff -urN dpkg-1.6.14/debian/changelog dpkg-1.6.14.1/debian/changelog
diff -urN dpkg-1.6.14/dselect/main.cc dpkg-1.6.14.1/dselect/main.cc
diff -urN dpkg-1.6.14/main/Makefile.in dpkg-1.6.14.1/main/Makefile.in
--- dpkg-1.6.14/main/Makefile.in Tue Jan 11 14:41:55 2000
+++ dpkg-1.6.14.1/main/Makefile.in Wed Oct 11 14:52:27 2000
@@ -55,5 +55,5 @@
archtable.h: $(top_srcdir)/archtable
expand $< | \
perl -ne 'print " { \"$$1\",$$2\"$$3\",$$4\"$$5\" },\n" \
- if m/^\s*(\w+)(\s+)(\w+)(\s+)(\w+)\s*$$/' \
+ if m/^\s*(\S+)(\s+)(\w+)(\s+)(\w+)\s*$$/' \
>$@
diff -urN dpkg-1.6.14/po/cat-id-tbl.c dpkg-1.6.14.1/po/cat-id-tbl.c
diff -urN dpkg-1.6.14/po/dpkg.pot dpkg-1.6.14.1/po/dpkg.pot
diff -urN dpkg-1.6.14/po/stamp-cat-id dpkg-1.6.14.1/po/stamp-cat-id
diff -urN dpkg-1.6.14/scripts/dpkg-architecture.pl
dpkg-1.6.14.1/scripts/dpkg-architecture.pl
--- dpkg-1.6.14/scripts/dpkg-architecture.pl Mon Feb 14 06:17:38 2000
+++ dpkg-1.6.14.1/scripts/dpkg-architecture.pl Wed Oct 11 14:52:12 2000
@@ -56,6 +56,7 @@
'powerpc', 'powerpc-linux',
'mips', 'mips-linux',
'mipsel', 'mipsel-linux',
+ 'hppa', 'hppa-linux',
'hurd-i386', 'i386-gnu');
sub usageversion {
--
[EMAIL PROTECTED], http://www.linuxcare.com/
Linuxcare. Support for the revolution.
