Group :: System/Configuration/Hardware
RPM: progsreiserfs
Navigation
Main Changelog Spec Patches Sources Download Gear Bugs and FR Repocop
Patch: progsreiserfs_0.3.0.4-3.diff
Download
Download
--- progsreiserfs-0.3.0.4.orig/config.guess
+++ progsreiserfs-0.3.0.4/config.guess
@@ -1,9 +1,9 @@
#! /bin/sh
# Attempt to guess a canonical system name.
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-# Free Software Foundation, Inc.
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+# 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
-timestamp='2001-04-20'
+timestamp='2004-01-05'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -24,8 +24,9 @@
# configuration script generated by Autoconf, you may include it under
# the same distribution terms that you use for the rest of that program.
-# Written by Per Bothner <bothner@cygnus.com>.
-# Please send patches to <config-patches@gnu.org>.
+# Originally written by Per Bothner <per@bothner.com>.
+# Please send patches to <config-patches@gnu.org>. Submit a context
+# diff and a properly formatted ChangeLog entry.
#
# This script attempts to guess a canonical system name similar to
# config.sub. If it succeeds, it prints the system name on stdout, and
@@ -52,7 +53,7 @@
GNU config.guess ($timestamp)
Originally written by Per Bothner.
-Copyright (C) 1992, 93, 94, 95, 96, 97, 98, 99, 2000
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
@@ -87,33 +88,45 @@
exit 1
fi
+trap 'exit 1' 1 2 15
-dummy=dummy-$$
-trap 'rm -f $dummy.c $dummy.o $dummy.rel $dummy; exit 1' 1 2 15
+# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
+# compiler to aid in system detection is discouraged as it requires
+# temporary files to be created and, as you can see below, it is a
+# headache to deal with in a portable fashion.
-# CC_FOR_BUILD -- compiler used by this script.
# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
# use `HOST_CC' if defined, but it is deprecated.
+# Portable tmp directory creation inspired by the Autoconf team.
+
+set_cc_for_build='
+trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
+trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
+: ${TMPDIR=/tmp} ;+ { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||+ { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||+ { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||+ { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;+dummy=$tmp/dummy ;
+tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
case $CC_FOR_BUILD,$HOST_CC,$CC in
- ,,) echo "int dummy(){}" > $dummy.c- for c in cc gcc c89 ; do
- ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1
- if test $? = 0 ; then
- CC_FOR_BUILD="$c"; break
- fi
- done
- rm -f $dummy.c $dummy.o $dummy.rel
+ ,,) echo "int x;" > $dummy.c ;
+ for c in cc gcc c89 c99 ; do
+ if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
+ CC_FOR_BUILD="$c"; break ;
+ fi ;
+ done ;
if test x"$CC_FOR_BUILD" = x ; then
- CC_FOR_BUILD=no_compiler_found
+ CC_FOR_BUILD=no_compiler_found ;
fi
;;
,,*) CC_FOR_BUILD=$CC ;;
,*,*) CC_FOR_BUILD=$HOST_CC ;;
-esac
+esac ;'
# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
-# (ghazi@noc.rutgers.edu 8/24/94.)
+# (ghazi@noc.rutgers.edu 1994-08-24)
if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
PATH=$PATH:/.attbin ; export PATH
fi
@@ -127,29 +140,31 @@
case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in*:NetBSD:*:*)
- # Netbsd (nbsd) targets should (where applicable) match one or
+ # NetBSD (nbsd) targets should (where applicable) match one or
# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
# *-*-netbsdecoff* and *-*-netbsd*. For targets that recently
# switched to ELF, *-*-netbsd* would select the old
# object file format. This provides both forward
# compatibility and a consistent mechanism for selecting the
# object file format.
- # Determine the machine/vendor (is the vendor relevant).
- case "${UNAME_MACHINE}" in- amiga) machine=m68k-unknown ;;
- arm32) machine=arm-unknown ;;
- atari*) machine=m68k-atari ;;
- sun3*) machine=m68k-sun ;;
- mac68k) machine=m68k-apple ;;
- macppc) machine=powerpc-apple ;;
- hp3[0-9][05]) machine=m68k-hp ;;
- ibmrt|romp-ibm) machine=romp-ibm ;;
- *) machine=${UNAME_MACHINE}-unknown ;;+ #
+ # Note: NetBSD doesn't particularly care about the vendor
+ # portion of the name. We always set it to "unknown".
+ sysctl="sysctl -n hw.machine_arch"
+ UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
+ /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
+ case "${UNAME_MACHINE_ARCH}" in+ armeb) machine=armeb-unknown ;;
+ arm*) machine=arm-unknown ;;
+ sh3el) machine=shl-unknown ;;
+ sh3eb) machine=sh-unknown ;;
+ *) machine=${UNAME_MACHINE_ARCH}-unknown ;;esac
# The Operating System including object format, if it has switched
# to ELF recently, or will in the future.
- case "${UNAME_MACHINE}" in- i386|sparc|amiga|arm*|hp300|mvme68k|vax|atari|luna68k|mac68k|news68k|next68k|pc532|sun3*|x68k)
+ case "${UNAME_MACHINE_ARCH}" in+ arm*|i386|m68k|ns32k|sh3*|sparc|vax)
+ eval $set_cc_for_build
if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
| grep __ELF__ >/dev/null
then
@@ -165,71 +180,115 @@
;;
esac
# The OS release
- release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`+ # Debian GNU/NetBSD machines have a different userland, and
+ # thus, need a distinct triplet. However, they do not need
+ # kernel version information, so it can be replaced with a
+ # suitable tag, in the style of linux-gnu.
+ case "${UNAME_VERSION}" in+ Debian*)
+ release='-gnu'
+ ;;
+ *)
+ release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`+ ;;
+ esac
# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
# contains redundant information, the shorter form:
# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
echo "${machine}-${os}${release}"exit 0 ;;
+ amiga:OpenBSD:*:*)
+ echo m68k-unknown-openbsd${UNAME_RELEASE}+ exit 0 ;;
+ arc:OpenBSD:*:*)
+ echo mipsel-unknown-openbsd${UNAME_RELEASE}+ exit 0 ;;
+ hp300:OpenBSD:*:*)
+ echo m68k-unknown-openbsd${UNAME_RELEASE}+ exit 0 ;;
+ mac68k:OpenBSD:*:*)
+ echo m68k-unknown-openbsd${UNAME_RELEASE}+ exit 0 ;;
+ macppc:OpenBSD:*:*)
+ echo powerpc-unknown-openbsd${UNAME_RELEASE}+ exit 0 ;;
+ mvme68k:OpenBSD:*:*)
+ echo m68k-unknown-openbsd${UNAME_RELEASE}+ exit 0 ;;
+ mvme88k:OpenBSD:*:*)
+ echo m88k-unknown-openbsd${UNAME_RELEASE}+ exit 0 ;;
+ mvmeppc:OpenBSD:*:*)
+ echo powerpc-unknown-openbsd${UNAME_RELEASE}+ exit 0 ;;
+ pegasos:OpenBSD:*:*)
+ echo powerpc-unknown-openbsd${UNAME_RELEASE}+ exit 0 ;;
+ pmax:OpenBSD:*:*)
+ echo mipsel-unknown-openbsd${UNAME_RELEASE}+ exit 0 ;;
+ sgi:OpenBSD:*:*)
+ echo mipseb-unknown-openbsd${UNAME_RELEASE}+ exit 0 ;;
+ sun3:OpenBSD:*:*)
+ echo m68k-unknown-openbsd${UNAME_RELEASE}+ exit 0 ;;
+ wgrisc:OpenBSD:*:*)
+ echo mipsel-unknown-openbsd${UNAME_RELEASE}+ exit 0 ;;
+ *:OpenBSD:*:*)
+ echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}+ exit 0 ;;
alpha:OSF1:*:*)
if test $UNAME_RELEASE = "V4.0"; then
UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`fi
+ # According to Compaq, /usr/sbin/psrinfo has been available on
+ # OSF/1 and Tru64 systems produced since 1995. I hope that
+ # covers most systems running today. This code pipes the CPU
+ # types through head -n 1, so we only detect the type of CPU 0.
+ ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1`
+ case "$ALPHA_CPU_TYPE" in
+ "EV4 (21064)")
+ UNAME_MACHINE="alpha" ;;
+ "EV4.5 (21064)")
+ UNAME_MACHINE="alpha" ;;
+ "LCA4 (21066/21068)")
+ UNAME_MACHINE="alpha" ;;
+ "EV5 (21164)")
+ UNAME_MACHINE="alphaev5" ;;
+ "EV5.6 (21164A)")
+ UNAME_MACHINE="alphaev56" ;;
+ "EV5.6 (21164PC)")
+ UNAME_MACHINE="alphapca56" ;;
+ "EV5.7 (21164PC)")
+ UNAME_MACHINE="alphapca57" ;;
+ "EV6 (21264)")
+ UNAME_MACHINE="alphaev6" ;;
+ "EV6.7 (21264A)")
+ UNAME_MACHINE="alphaev67" ;;
+ "EV6.8CB (21264C)")
+ UNAME_MACHINE="alphaev68" ;;
+ "EV6.8AL (21264B)")
+ UNAME_MACHINE="alphaev68" ;;
+ "EV6.8CX (21264D)")
+ UNAME_MACHINE="alphaev68" ;;
+ "EV6.9A (21264/EV69A)")
+ UNAME_MACHINE="alphaev69" ;;
+ "EV7 (21364)")
+ UNAME_MACHINE="alphaev7" ;;
+ "EV7.9 (21364A)")
+ UNAME_MACHINE="alphaev79" ;;
+ esac
# A Vn.n version is a released version.
# A Tn.n version is a released field test version.
# A Xn.n version is an unreleased experimental baselevel.
# 1.2 uses "1.2" for uname -r.
- cat <<EOF >$dummy.s
- .data
-\$Lformat:
- .byte 37,100,45,37,120,10,0 # "%d-%x\n"
-
- .text
- .globl main
- .align 4
- .ent main
-main:
- .frame \$30,16,\$26,0
- ldgp \$29,0(\$27)
- .prologue 1
- .long 0x47e03d80 # implver \$0
- lda \$2,-1
- .long 0x47e20c21 # amask \$2,\$1
- lda \$16,\$Lformat
- mov \$0,\$17
- not \$1,\$18
- jsr \$26,printf
- ldgp \$29,0(\$26)
- mov 0,\$16
- jsr \$26,exit
- .end main
-EOF
- $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
- if test "$?" = 0 ; then
- case `./$dummy` in
- 0-0)
- UNAME_MACHINE="alpha"
- ;;
- 1-0)
- UNAME_MACHINE="alphaev5"
- ;;
- 1-1)
- UNAME_MACHINE="alphaev56"
- ;;
- 1-101)
- UNAME_MACHINE="alphapca56"
- ;;
- 2-303)
- UNAME_MACHINE="alphaev6"
- ;;
- 2-307)
- UNAME_MACHINE="alphaev67"
- ;;
- esac
- fi
- rm -f $dummy.s $dummy
echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`exit 0 ;;
+ Alpha*:OpenVMS:*:*)
+ echo alpha-hp-vms
+ exit 0 ;;
Alpha\ *:Windows_NT*:*)
# How do we know it's Interix rather than the generic POSIX subsystem?
# Should we change UNAME_MACHINE based on the output of uname instead
@@ -242,33 +301,18 @@
Amiga*:UNIX_System_V:4.0:*)
echo m68k-unknown-sysv4
exit 0;;
- amiga:OpenBSD:*:*)
- echo m68k-unknown-openbsd${UNAME_RELEASE}- exit 0 ;;
*:[Aa]miga[Oo][Ss]:*:*)
echo ${UNAME_MACHINE}-unknown-amigaosexit 0 ;;
- arc64:OpenBSD:*:*)
- echo mips64el-unknown-openbsd${UNAME_RELEASE}- exit 0 ;;
- arc:OpenBSD:*:*)
- echo mipsel-unknown-openbsd${UNAME_RELEASE}- exit 0 ;;
- hkmips:OpenBSD:*:*)
- echo mips-unknown-openbsd${UNAME_RELEASE}- exit 0 ;;
- pmax:OpenBSD:*:*)
- echo mipsel-unknown-openbsd${UNAME_RELEASE}- exit 0 ;;
- sgi:OpenBSD:*:*)
- echo mips-unknown-openbsd${UNAME_RELEASE}- exit 0 ;;
- wgrisc:OpenBSD:*:*)
- echo mipsel-unknown-openbsd${UNAME_RELEASE}+ *:[Mm]orph[Oo][Ss]:*:*)
+ echo ${UNAME_MACHINE}-unknown-morphosexit 0 ;;
*:OS/390:*:*)
echo i370-ibm-openedition
exit 0 ;;
+ *:OS400:*:*)
+ echo powerpc-ibm-os400
+ exit 0 ;;
arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
echo arm-acorn-riscix${UNAME_RELEASE}exit 0;;
@@ -286,6 +330,13 @@
NILE*:*:*:dcosx)
echo pyramid-pyramid-svr4
exit 0 ;;
+ DRS?6000:unix:4.0:6*)
+ echo sparc-icl-nx6
+ exit 0 ;;
+ DRS?6000:UNIX_SV:4.2*:7*)
+ case `/usr/bin/uname -p` in
+ sparc) echo sparc-icl-nx7 && exit 0 ;;
+ esac ;;
sun4H:SunOS:5.*:*)
echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`exit 0 ;;
@@ -314,7 +365,7 @@
echo m68k-sun-sunos${UNAME_RELEASE}exit 0 ;;
sun*:*:4.2BSD:*)
- UNAME_RELEASE=`(head -1 /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`+ UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3case "`/bin/arch`" in
sun3)
@@ -328,9 +379,6 @@
aushp:SunOS:*:*)
echo sparc-auspex-sunos${UNAME_RELEASE}exit 0 ;;
- atari*:OpenBSD:*:*)
- echo m68k-unknown-openbsd${UNAME_RELEASE}- exit 0 ;;
# The situation for MiNT is a little confusing. The machine name
# can be virtually everything (everything which is not
# "atarist" or "atariste" at least should have a processor
@@ -357,18 +405,6 @@
*:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
echo m68k-unknown-mint${UNAME_RELEASE}exit 0 ;;
- sun3*:OpenBSD:*:*)
- echo m68k-unknown-openbsd${UNAME_RELEASE}- exit 0 ;;
- mac68k:OpenBSD:*:*)
- echo m68k-unknown-openbsd${UNAME_RELEASE}- exit 0 ;;
- mvme68k:OpenBSD:*:*)
- echo m68k-unknown-openbsd${UNAME_RELEASE}- exit 0 ;;
- mvme88k:OpenBSD:*:*)
- echo m88k-unknown-openbsd${UNAME_RELEASE}- exit 0 ;;
powerpc:machten:*:*)
echo powerpc-apple-machten${UNAME_RELEASE}exit 0 ;;
@@ -385,6 +421,7 @@
echo clipper-intergraph-clix${UNAME_RELEASE}exit 0 ;;
mips:*:*:UMIPS | mips:*:*:RISCos)
+ eval $set_cc_for_build
sed 's/^ //' << EOF >$dummy.c
#ifdef __cplusplus
#include <stdio.h> /* for printf() prototype */
@@ -406,15 +443,20 @@
exit (-1);
}
EOF
- $CC_FOR_BUILD $dummy.c -o $dummy \
- && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \- && rm -f $dummy.c $dummy && exit 0
- rm -f $dummy.c $dummy
+ $CC_FOR_BUILD -o $dummy $dummy.c \
+ && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \+ && exit 0
echo mips-mips-riscos${UNAME_RELEASE}exit 0 ;;
Motorola:PowerMAX_OS:*:*)
echo powerpc-motorola-powermax
exit 0 ;;
+ Motorola:*:4.3:PL8-*)
+ echo powerpc-harris-powermax
+ exit 0 ;;
+ Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
+ echo powerpc-harris-powermax
+ exit 0 ;;
Night_Hawk:Power_UNIX:*:*)
echo powerpc-harris-powerunix
exit 0 ;;
@@ -475,6 +517,7 @@
exit 0 ;;
*:AIX:2:3)
if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
+ eval $set_cc_for_build
sed 's/^ //' << EOF >$dummy.c
#include <sys/systemcfg.h>
@@ -486,8 +529,7 @@
exit(0);
}
EOF
- $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
- rm -f $dummy.c $dummy
+ $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
echo rs6000-ibm-aix3.2.5
elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
echo rs6000-ibm-aix3.2.4
@@ -496,7 +538,7 @@
fi
exit 0 ;;
*:AIX:*:[45])
- IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'`+ IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; thenIBM_ARCH=rs6000
else
@@ -536,10 +578,8 @@
9000/31? ) HP_ARCH=m68000 ;;
9000/[34]?? ) HP_ARCH=m68k ;;
9000/[678][0-9][0-9])
- case "${HPUX_REV}" in- 11.[0-9][0-9])
- if [ -x /usr/bin/getconf ]; then
- sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
+ if [ -x /usr/bin/getconf ]; then
+ sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
case "${sc_cpu_version}" in523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
@@ -548,12 +588,13 @@
case "${sc_kernel_bits}" in32) HP_ARCH="hppa2.0n" ;;
64) HP_ARCH="hppa2.0w" ;;
+ '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20
esac ;;
esac
- fi ;;
- esac
- if [ "${HP_ARCH}" = "" ]; then- sed 's/^ //' << EOF >$dummy.c
+ fi
+ if [ "${HP_ARCH}" = "" ]; then+ eval $set_cc_for_build
+ sed 's/^ //' << EOF >$dummy.c
#define _HPUX_SOURCE
#include <stdlib.h>
@@ -586,11 +627,21 @@
exit (0);
}
EOF
- (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy`
- if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi
- rm -f $dummy.c $dummy
- fi ;;
+ (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
+ test -z "$HP_ARCH" && HP_ARCH=hppa
+ fi ;;
esac
+ if [ ${HP_ARCH} = "hppa2.0w" ]+ then
+ # avoid double evaluation of $set_cc_for_build
+ test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
+ if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null
+ then
+ HP_ARCH="hppa2.0w"
+ else
+ HP_ARCH="hppa64"
+ fi
+ fi
echo ${HP_ARCH}-hp-hpux${HPUX_REV}exit 0 ;;
ia64:HP-UX:*:*)
@@ -598,6 +649,7 @@
echo ia64-hp-hpux${HPUX_REV}exit 0 ;;
3050*:HI-UX:*:*)
+ eval $set_cc_for_build
sed 's/^ //' << EOF >$dummy.c
#include <unistd.h>
int
@@ -623,8 +675,7 @@
exit (0);
}
EOF
- $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
- rm -f $dummy.c $dummy
+ $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
echo unknown-hitachi-hiuxwe2
exit 0 ;;
9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
@@ -633,7 +684,7 @@
9000/8??:4.3bsd:*:*)
echo hppa1.0-hp-bsd
exit 0 ;;
- *9??*:MPE/iX:*:*)
+ *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
echo hppa1.0-hp-mpeix
exit 0 ;;
hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
@@ -652,9 +703,6 @@
parisc*:Lites*:*:*)
echo hppa1.1-hp-lites
exit 0 ;;
- hppa*:OpenBSD:*:*)
- echo hppa-unknown-openbsd
- exit 0 ;;
C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
echo c1-convex-bsd
exit 0 ;;
@@ -673,40 +721,37 @@
C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
echo c4-convex-bsd
exit 0 ;;
- CRAY*X-MP:*:*:*)
- echo xmp-cray-unicos
- exit 0 ;;
CRAY*Y-MP:*:*:*)
- echo ymp-cray-unicos${UNAME_RELEASE}+ echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'exit 0 ;;
CRAY*[A-Z]90:*:*:*)
echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
- -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/
+ -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
+ -e 's/\.[^.]*$/.X/'
exit 0 ;;
CRAY*TS:*:*:*)
echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'exit 0 ;;
- CRAY*T3D:*:*:*)
- echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'- exit 0 ;;
CRAY*T3E:*:*:*)
echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'exit 0 ;;
CRAY*SV1:*:*:*)
echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'exit 0 ;;
- CRAY-2:*:*:*)
- echo cray2-cray-unicos
- exit 0 ;;
+ *:UNICOS/mp:*:*)
+ echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'+ exit 0 ;;
F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"exit 0 ;;
- hp300:OpenBSD:*:*)
- echo m68k-unknown-openbsd${UNAME_RELEASE}+ 5000:UNIX_System_V:4.*:*)
+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+ FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`+ echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"exit 0 ;;
i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}@@ -718,10 +763,21 @@
echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}exit 0 ;;
*:FreeBSD:*:*)
- echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`- exit 0 ;;
- *:OpenBSD:*:*)
- echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`+ # Determine whether the default compiler uses glibc.
+ eval $set_cc_for_build
+ sed 's/^ //' << EOF >$dummy.c
+ #include <features.h>
+ #if __GLIBC__ >= 2
+ LIBC=gnu
+ #else
+ LIBC=
+ #endif
+EOF
+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
+ # GNU/KFreeBSD systems have a "k" prefix to indicate we are using
+ # FreeBSD's kernel, but not the complete OS.
+ case ${LIBC} in gnu) kernel_only='k' ;; esac+ echo ${UNAME_MACHINE}-unknown-${kernel_only}freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}exit 0 ;;
i*:CYGWIN*:*)
echo ${UNAME_MACHINE}-pc-cygwin@@ -732,11 +788,17 @@
i*:PW*:*)
echo ${UNAME_MACHINE}-pc-pw32exit 0 ;;
+ x86:Interix*:[34]*)
+ echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'+ exit 0 ;;
+ [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
+ echo i${UNAME_MACHINE}-pc-mks+ exit 0 ;;
i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
# How do we know it's Interix rather than the generic POSIX subsystem?
# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
# UNAME_MACHINE based on the output of uname instead of i386?
- echo i386-pc-interix
+ echo i586-pc-interix
exit 0 ;;
i*:UWIN*:*)
echo ${UNAME_MACHINE}-pc-uwin@@ -748,112 +810,84 @@
echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`exit 0 ;;
*:GNU:*:*)
+ # the GNU system
echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`exit 0 ;;
+ *:GNU/*:*:*)
+ # other systems with GNU libc and userland
+ echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu+ exit 0 ;;
i*86:Minix:*:*)
echo ${UNAME_MACHINE}-pc-minixexit 0 ;;
arm*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnuexit 0 ;;
+ cris:Linux:*:*)
+ echo cris-axis-linux-gnu
+ exit 0 ;;
ia64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux+ echo ${UNAME_MACHINE}-unknown-linux-gnuexit 0 ;;
m68*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnuexit 0 ;;
mips:Linux:*:*)
- cat >$dummy.c <<EOF
-#ifdef __cplusplus
-#include <stdio.h> /* for printf() prototype */
-int main (int argc, char *argv[]) {-#else
-int main (argc, argv) int argc; char *argv[]; {-#endif
-#ifdef __MIPSEB__
- printf ("%s-unknown-linux-gnu\n", argv[1]);-#endif
-#ifdef __MIPSEL__
- printf ("%sel-unknown-linux-gnu\n", argv[1]);-#endif
- return 0;
-}
+ eval $set_cc_for_build
+ sed 's/^ //' << EOF >$dummy.c
+ #undef CPU
+ #undef mips
+ #undef mipsel
+ #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+ CPU=mipsel
+ #else
+ #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+ CPU=mips
+ #else
+ CPU=
+ #endif
+ #endif
EOF
- $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm -f $dummy.c $dummy && exit 0- rm -f $dummy.c $dummy
+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
+ test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0;;
- ppc:Linux:*:*)
- # Determine Lib Version
- cat >$dummy.c <<EOF
-#include <features.h>
-#if defined(__GLIBC__)
-extern char __libc_version[];
-extern char __libc_release[];
-#endif
-main(argc, argv)
- int argc;
- char *argv[];
-{-#if defined(__GLIBC__)
- printf("%s %s\n", __libc_version, __libc_release);-#else
- printf("unknown\n");-#endif
- return 0;
-}
+ mips64:Linux:*:*)
+ eval $set_cc_for_build
+ sed 's/^ //' << EOF >$dummy.c
+ #undef CPU
+ #undef mips64
+ #undef mips64el
+ #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+ CPU=mips64el
+ #else
+ #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+ CPU=mips64
+ #else
+ CPU=
+ #endif
+ #endif
EOF
- LIBC=""
- $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null
- if test "$?" = 0 ; then
- ./$dummy | grep 1\.99 > /dev/null
- if test "$?" = 0 ; then LIBC="libc1" ; fi
- fi
- rm -f $dummy.c $dummy
- echo powerpc-unknown-linux-gnu${LIBC}+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
+ test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0+ ;;
+ ppc:Linux:*:*)
+ echo powerpc-unknown-linux-gnu
+ exit 0 ;;
+ ppc64:Linux:*:*)
+ echo powerpc64-unknown-linux-gnu
exit 0 ;;
alpha:Linux:*:*)
- cat <<EOF >$dummy.s
- .data
- \$Lformat:
- .byte 37,100,45,37,120,10,0 # "%d-%x\n"
- .text
- .globl main
- .align 4
- .ent main
- main:
- .frame \$30,16,\$26,0
- ldgp \$29,0(\$27)
- .prologue 1
- .long 0x47e03d80 # implver \$0
- lda \$2,-1
- .long 0x47e20c21 # amask \$2,\$1
- lda \$16,\$Lformat
- mov \$0,\$17
- not \$1,\$18
- jsr \$26,printf
- ldgp \$29,0(\$26)
- mov 0,\$16
- jsr \$26,exit
- .end main
-EOF
- LIBC=""
- $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
- if test "$?" = 0 ; then
- case `./$dummy` in
- 0-0) UNAME_MACHINE="alpha" ;;
- 1-0) UNAME_MACHINE="alphaev5" ;;
- 1-1) UNAME_MACHINE="alphaev56" ;;
- 1-101) UNAME_MACHINE="alphapca56" ;;
- 2-303) UNAME_MACHINE="alphaev6" ;;
- 2-307) UNAME_MACHINE="alphaev67" ;;
- esac
- objdump --private-headers $dummy | \
- grep ld.so.1 > /dev/null
- if test "$?" = 0 ; then
- LIBC="libc1"
- fi
- fi
- rm -f $dummy.s $dummy
+ case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+ EV5) UNAME_MACHINE=alphaev5 ;;
+ EV56) UNAME_MACHINE=alphaev56 ;;
+ PCA56) UNAME_MACHINE=alphapca56 ;;
+ PCA57) UNAME_MACHINE=alphapca56 ;;
+ EV6) UNAME_MACHINE=alphaev6 ;;
+ EV67) UNAME_MACHINE=alphaev67 ;;
+ EV68*) UNAME_MACHINE=alphaev68 ;;
+ esac
+ objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
+ if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}exit 0 ;;
parisc:Linux:*:* | hppa:Linux:*:*)
@@ -870,6 +904,9 @@
s390:Linux:*:* | s390x:Linux:*:*)
echo ${UNAME_MACHINE}-ibm-linuxexit 0 ;;
+ sh64*:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu+ exit 0 ;;
sh*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnuexit 0 ;;
@@ -883,71 +920,62 @@
# The BFD linker knows what the default object file format is, so
# first see if it will tell us. cd to the root directory to prevent
# problems with other programs or directories called `ld' in the path.
- ld_supported_emulations=`cd /; ld --help 2>&1 \
- | sed -ne '/supported emulations:/!d
+ # Set LC_ALL=C to ensure ld outputs messages in English.
+ ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
+ | sed -ne '/supported targets:/!d
s/[ ][ ]*/ /g
- s/.*supported emulations: *//
+ s/.*supported targets: *//
s/ .*//
p'`
- case "$ld_supported_emulations" in
- i*86linux)
- echo "${UNAME_MACHINE}-pc-linux-gnuaout"- exit 0
- ;;
- elf_i*86)
+ case "$ld_supported_targets" in
+ elf32-i386)
TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu";;
- i*86coff)
+ a.out-i386-linux)
+ echo "${UNAME_MACHINE}-pc-linux-gnuaout"+ exit 0 ;;
+ coff-i386)
echo "${UNAME_MACHINE}-pc-linux-gnucoff"- exit 0
- ;;
- esac
- # Either a pre-BFD a.out linker (linux-gnuoldld)
- # or one that does not give us useful --help.
- # GCC wants to distinguish between linux-gnuoldld and linux-gnuaout.
- # If ld does not provide *any* "supported emulations:"
- # that means it is gnuoldld.
- test -z "$ld_supported_emulations" && echo "${UNAME_MACHINE}-pc-linux-gnuoldld" && exit 0- case "${UNAME_MACHINE}" in- i*86)
- VENDOR=pc;
- ;;
- *)
- VENDOR=unknown;
- ;;
+ exit 0 ;;
+ "")
+ # Either a pre-BFD a.out linker (linux-gnuoldld) or
+ # one that does not give us useful --help.
+ echo "${UNAME_MACHINE}-pc-linux-gnuoldld"+ exit 0 ;;
esac
# Determine whether the default compiler is a.out or elf
- cat >$dummy.c <<EOF
-#include <features.h>
-#ifdef __cplusplus
-#include <stdio.h> /* for printf() prototype */
- int main (int argc, char *argv[]) {-#else
- int main (argc, argv) int argc; char *argv[]; {-#endif
-#ifdef __ELF__
-# ifdef __GLIBC__
-# if __GLIBC__ >= 2
- printf ("%s-${VENDOR}-linux-gnu\n", argv[1]);-# else
- printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]);-# endif
-# else
- printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]);-# endif
-#else
- printf ("%s-${VENDOR}-linux-gnuaout\n", argv[1]);-#endif
- return 0;
-}
+ eval $set_cc_for_build
+ sed 's/^ //' << EOF >$dummy.c
+ #include <features.h>
+ #ifdef __ELF__
+ # ifdef __GLIBC__
+ # if __GLIBC__ >= 2
+ LIBC=gnu
+ # else
+ LIBC=gnulibc1
+ # endif
+ # else
+ LIBC=gnulibc1
+ # endif
+ #else
+ #ifdef __INTEL_COMPILER
+ LIBC=gnu
+ #else
+ LIBC=gnuaout
+ #endif
+ #endif
+ #ifdef __dietlibc__
+ LIBC=dietlibc
+ #endif
EOF
- $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm -f $dummy.c $dummy && exit 0- rm -f $dummy.c $dummy
+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
+ test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0 test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0;;
-# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. earlier versions
-# are messed up and put the nodename in both sysname and nodename.
i*86:DYNIX/ptx:4*:*)
+ # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
+ # earlier versions are messed up and put the nodename in both
+ # sysname and nodename.
echo i386-sequent-sysv4
exit 0 ;;
i*86:UNIX_SV:4.2MP:2.*)
@@ -958,6 +986,26 @@
# Use sysv4.2uw... so that sysv4* matches it.
echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}exit 0 ;;
+ i*86:OS/2:*:*)
+ # If we were able to find `uname', then EMX Unix compatibility
+ # is probably installed.
+ echo ${UNAME_MACHINE}-pc-os2-emx+ exit 0 ;;
+ i*86:XTS-300:*:STOP)
+ echo ${UNAME_MACHINE}-unknown-stop+ exit 0 ;;
+ i*86:atheos:*:*)
+ echo ${UNAME_MACHINE}-unknown-atheos+ exit 0 ;;
+ i*86:syllable:*:*)
+ echo ${UNAME_MACHINE}-pc-syllable+ exit 0 ;;
+ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
+ echo i386-unknown-lynxos${UNAME_RELEASE}+ exit 0 ;;
+ i*86:*DOS:*:*)
+ echo ${UNAME_MACHINE}-pc-msdosdjgpp+ exit 0 ;;
i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
@@ -966,36 +1014,32 @@
echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}fi
exit 0 ;;
- i*86:*:5:7*)
- # Fixed at (any) Pentium or better
- UNAME_MACHINE=i586
- if [ ${UNAME_SYSTEM} = "UnixWare" ] ; then- echo ${UNAME_MACHINE}-sco-sysv${UNAME_RELEASE}uw${UNAME_VERSION}- else
- echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE}- fi
+ i*86:*:5:[78]*)
+ case `/bin/uname -X | grep "^Machine"` in
+ *486*) UNAME_MACHINE=i486 ;;
+ *Pentium) UNAME_MACHINE=i586 ;;
+ *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
+ esac
+ echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}exit 0 ;;
i*86:*:3.2:*)
if test -f /usr/options/cb.name; then
UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
echo ${UNAME_MACHINE}-pc-isc$UNAME_RELelif /bin/uname -X 2>/dev/null >/dev/null ; then
- UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')`
- (/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
- (/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
+ UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
+ (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
+ (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
&& UNAME_MACHINE=i586
- (/bin/uname -X|egrep '^Machine.*Pent ?II' >/dev/null) \
+ (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
&& UNAME_MACHINE=i686
- (/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) \
+ (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
&& UNAME_MACHINE=i686
echo ${UNAME_MACHINE}-pc-sco$UNAME_RELelse
echo ${UNAME_MACHINE}-pc-sysv32fi
exit 0 ;;
- i*86:*DOS:*:*)
- echo ${UNAME_MACHINE}-pc-msdosdjgpp- exit 0 ;;
pc:*:*:*)
# Left here for compatibility:
# uname -m prints for DJGPP always 'pc', but it prints nothing about
@@ -1019,9 +1063,15 @@
# "miniframe"
echo m68010-convergent-sysv
exit 0 ;;
+ mc68k:UNIX:SYSTEM5:3.51m)
+ echo m68k-convergent-sysv
+ exit 0 ;;
+ M680?0:D-NIX:5.3:*)
+ echo m68k-diab-dnix
+ exit 0 ;;
M68*:*:R3V[567]*:*)
test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
- 3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0)
+ 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0)
OS_REL=''
test -r /etc/.relid \
&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
@@ -1038,9 +1088,6 @@
mc68030:UNIX_System_V:4.*:*)
echo m68k-atari-sysv4
exit 0 ;;
- i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
- echo i386-unknown-lynxos${UNAME_RELEASE}- exit 0 ;;
TSUNAMI:LynxOS:2.*:*)
echo sparc-unknown-lynxos${UNAME_RELEASE}exit 0 ;;
@@ -1067,8 +1114,8 @@
echo ns32k-sni-sysv
fi
exit 0 ;;
- PENTIUM:CPunix:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
- # says <Richard.M.Bartel@ccMail.Census.GOV>
+ PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+ # says <Richard.M.Bartel@ccMail.Census.GOV>
echo i586-unisys-sysv4
exit 0 ;;
*:UNIX_System_V:4*:FTX*)
@@ -1080,6 +1127,10 @@
# From seanf@swdc.stratus.com.
echo i860-stratus-sysv4
exit 0 ;;
+ *:VOS:*:*)
+ # From Paul.Green@stratus.com.
+ echo hppa1.1-stratus-vos
+ exit 0 ;;
mc68*:A/UX:*:*)
echo m68k-apple-aux${UNAME_RELEASE}exit 0 ;;
@@ -1108,6 +1159,9 @@
SX-5:SUPER-UX:*:*)
echo sx5-nec-superux${UNAME_RELEASE}exit 0 ;;
+ SX-6:SUPER-UX:*:*)
+ echo sx6-nec-superux${UNAME_RELEASE}+ exit 0 ;;
Power*:Rhapsody:*:*)
echo powerpc-apple-rhapsody${UNAME_RELEASE}exit 0 ;;
@@ -1115,18 +1169,24 @@
echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}exit 0 ;;
*:Darwin:*:*)
- echo `uname -p`-apple-darwin${UNAME_RELEASE}+ case `uname -p` in
+ *86) UNAME_PROCESSOR=i686 ;;
+ powerpc) UNAME_PROCESSOR=powerpc ;;
+ esac
+ echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}exit 0 ;;
*:procnto*:*:* | *:QNX:[0123456789]*:*)
- if test "${UNAME_MACHINE}" = "x86pc"; then+ UNAME_PROCESSOR=`uname -p`
+ if test "$UNAME_PROCESSOR" = "x86"; then
+ UNAME_PROCESSOR=i386
UNAME_MACHINE=pc
fi
- echo `uname -p`-${UNAME_MACHINE}-nto-qnx+ echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}exit 0 ;;
*:QNX:*:4*)
echo i386-pc-qnx
exit 0 ;;
- NSR-[KW]:NONSTOP_KERNEL:*:*)
+ NSR-?:NONSTOP_KERNEL:*:*)
echo nsr-tandem-nsk${UNAME_RELEASE}exit 0 ;;
*:NonStop-UX:*:*)
@@ -1149,11 +1209,6 @@
fi
echo ${UNAME_MACHINE}-unknown-plan9exit 0 ;;
- i*86:OS/2:*:*)
- # If we were able to find `uname', then EMX Unix compatibility
- # is probably installed.
- echo ${UNAME_MACHINE}-pc-os2-emx- exit 0 ;;
*:TOPS-10:*:*)
echo pdp10-unknown-tops10
exit 0 ;;
@@ -1172,11 +1227,18 @@
*:ITS:*:*)
echo pdp10-unknown-its
exit 0 ;;
+ SEI:*:*:SEIUX)
+ echo mips-sei-seiux${UNAME_RELEASE}+ exit 0 ;;
+ *:DRAGONFLY:*:*)
+ echo ${UNAME_MACHINE}-unknown-dragonfly${UNAME_RELEASE}+ exit 0 ;;
esac
#echo '(No uname command or uname output not recognized.)' 1>&2
#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2+eval $set_cc_for_build
cat >$dummy.c <<EOF
#ifdef _SEQUENT_
# include <sys/types.h>
@@ -1291,8 +1353,7 @@
}
EOF
-$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm -f $dummy.c $dummy && exit 0
-rm -f $dummy.c $dummy
+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0
# Apollos put the system type in the environment.
--- progsreiserfs-0.3.0.4.orig/config.sub
+++ progsreiserfs-0.3.0.4/config.sub
@@ -1,9 +1,9 @@
#! /bin/sh
# Configuration validation subroutine script.
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-# Free Software Foundation, Inc.
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+# 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
-timestamp='2001-04-20'
+timestamp='2004-01-05'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -29,7 +29,8 @@
# configuration script generated by Autoconf, you may include it under
# the same distribution terms that you use for the rest of that program.
-# Please send patches to <config-patches@gnu.org>.
+# Please send patches to <config-patches@gnu.org>. Submit a context
+# diff and a properly formatted ChangeLog entry.
#
# Configuration subroutine to validate and canonicalize a configuration type.
# Supply the specified configuration type as an argument.
@@ -117,7 +118,8 @@
# Here we must recognize all the valid KERNEL-OS combinations.
maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
case $maybe_os in
- nto-qnx* | linux-gnu* | storm-chaos* | os2-emx*)
+ nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
+ kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
os=-$maybe_os
basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
;;
@@ -157,6 +159,14 @@
os=-vxworks
basic_machine=$1
;;
+ -chorusos*)
+ os=-chorusos
+ basic_machine=$1
+ ;;
+ -chorusrdb)
+ os=-chorusrdb
+ basic_machine=$1
+ ;;
-hiux*)
os=-hiuxwe2
;;
@@ -215,26 +225,50 @@
case $basic_machine in
# Recognize the basic CPU types without company name.
# Some are omitted here because they have special meanings below.
- tahoe | i860 | ia64 | m32r | m68k | m68000 | m88k | ns32k | arc \
- | arm | arme[lb] | arm[bl]e | armv[2345] | armv[345][lb] | strongarm | xscale \
- | pyramid | mn10200 | mn10300 | tron | a29k \
- | 580 | i960 | h8300 \
- | x86 | ppcbe | mipsbe | mipsle | shbe | shle \
- | hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \
- | hppa64 \
- | alpha | alphaev[4-8] | alphaev56 | alphapca5[67] \
- | alphaev6[78] \
- | we32k | ns16k | clipper | i370 | sh | sh[34] \
- | powerpc | powerpcle \
- | 1750a | dsp16xx | pdp10 | pdp11 \
- | mips16 | mips64 | mipsel | mips64el \
- | mips64orion | mips64orionel | mipstx39 | mipstx39el \
- | mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \
- | mips64vr5000 | miprs64vr5000el | mcore | s390 | s390x \
- | sparc | sparclet | sparclite | sparc64 | sparcv9 | sparcv9b \
- | v850 | c4x \
- | thumb | d10v | d30v | fr30 | avr | openrisc | tic80 \
- | pj | pjl | h8500)
+ 1750a | 580 \
+ | a29k \
+ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
+ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
+ | am33_2.0 \
+ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
+ | c4x | clipper \
+ | d10v | d30v | dlx | dsp16xx \
+ | fr30 | frv \
+ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+ | i370 | i860 | i960 | ia64 \
+ | ip2k | iq2000 \
+ | m32r | m68000 | m68k | m88k | mcore \
+ | mips | mipsbe | mipseb | mipsel | mipsle \
+ | mips16 \
+ | mips64 | mips64el \
+ | mips64vr | mips64vrel \
+ | mips64orion | mips64orionel \
+ | mips64vr4100 | mips64vr4100el \
+ | mips64vr4300 | mips64vr4300el \
+ | mips64vr5000 | mips64vr5000el \
+ | mipsisa32 | mipsisa32el \
+ | mipsisa32r2 | mipsisa32r2el \
+ | mipsisa64 | mipsisa64el \
+ | mipsisa64r2 | mipsisa64r2el \
+ | mipsisa64sb1 | mipsisa64sb1el \
+ | mipsisa64sr71k | mipsisa64sr71kel \
+ | mipstx39 | mipstx39el \
+ | mn10200 | mn10300 \
+ | msp430 \
+ | ns16k | ns32k \
+ | openrisc | or32 \
+ | pdp10 | pdp11 | pj | pjl \
+ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
+ | pyramid \
+ | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
+ | sh64 | sh64le \
+ | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
+ | strongarm \
+ | tahoe | thumb | tic4x | tic80 | tron \
+ | v850 | v850e \
+ | we32k \
+ | x86 | xscale | xstormy16 | xtensa \
+ | z8k)
basic_machine=$basic_machine-unknown
;;
m6811 | m68hc11 | m6812 | m68hc12)
@@ -242,7 +276,7 @@
basic_machine=$basic_machine-unknown
os=-none
;;
- m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | w65)
+ m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
;;
# We use `pc' rather than `unknown'
@@ -257,31 +291,61 @@
exit 1
;;
# Recognize the basic CPU types with company name.
- # FIXME: clean up the formatting here.
- vax-* | tahoe-* | i*86-* | i860-* | ia64-* | m32r-* | m68k-* | m68000-* \
- | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | c[123]* \
- | arm-* | armbe-* | armle-* | armv*-* | strongarm-* | xscale-* \
- | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
- | power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \
- | xmp-* | ymp-* \
- | x86-* | ppcbe-* | mipsbe-* | mipsle-* | shbe-* | shle-* \
- | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* \
- | hppa2.0n-* | hppa64-* \
- | alpha-* | alphaev[4-8]-* | alphaev56-* | alphapca5[67]-* \
- | alphaev6[78]-* \
- | we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \
- | clipper-* | orion-* \
- | sparclite-* | pdp10-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
- | sparc64-* | sparcv9-* | sparcv9b-* | sparc86x-* \
- | mips16-* | mips64-* | mipsel-* \
- | mips64el-* | mips64orion-* | mips64orionel-* \
- | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \
- | mipstx39-* | mipstx39el-* | mcore-* \
- | f30[01]-* | f700-* | s390-* | s390x-* | sv1-* | t3e-* \
- | [cjt]90-* \
- | m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \
- | thumb-* | v850-* | d30v-* | tic30-* | tic80-* | c30-* | fr30-* \
- | bs2000-* | tic54x-* | c54x-* | x86_64-* | pj-* | pjl-*)
+ 580-* \
+ | a29k-* \
+ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
+ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
+ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
+ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \
+ | avr-* \
+ | bs2000-* \
+ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
+ | clipper-* | cydra-* \
+ | d10v-* | d30v-* | dlx-* \
+ | elxsi-* \
+ | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
+ | h8300-* | h8500-* \
+ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
+ | i*86-* | i860-* | i960-* | ia64-* \
+ | ip2k-* | iq2000-* \
+ | m32r-* \
+ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
+ | m88110-* | m88k-* | mcore-* \
+ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
+ | mips16-* \
+ | mips64-* | mips64el-* \
+ | mips64vr-* | mips64vrel-* \
+ | mips64orion-* | mips64orionel-* \
+ | mips64vr4100-* | mips64vr4100el-* \
+ | mips64vr4300-* | mips64vr4300el-* \
+ | mips64vr5000-* | mips64vr5000el-* \
+ | mipsisa32-* | mipsisa32el-* \
+ | mipsisa32r2-* | mipsisa32r2el-* \
+ | mipsisa64-* | mipsisa64el-* \
+ | mipsisa64r2-* | mipsisa64r2el-* \
+ | mipsisa64sb1-* | mipsisa64sb1el-* \
+ | mipsisa64sr71k-* | mipsisa64sr71kel-* \
+ | mipstx39-* | mipstx39el-* \
+ | msp430-* \
+ | none-* | np1-* | nv1-* | ns16k-* | ns32k-* \
+ | orion-* \
+ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
+ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
+ | pyramid-* \
+ | romp-* | rs6000-* \
+ | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
+ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
+ | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
+ | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
+ | tahoe-* | thumb-* \
+ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+ | tron-* \
+ | v850-* | v850e-* | vax-* \
+ | we32k-* \
+ | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
+ | xtensa-* \
+ | ymp-* \
+ | z8k-*)
;;
# Recognize the various machine names and aliases which stand
# for a CPU type and a company and sometimes even an OS.
@@ -313,6 +377,12 @@
basic_machine=a29k-none
os=-bsd
;;
+ amd64)
+ basic_machine=x86_64-pc
+ ;;
+ amd64-*)
+ basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
amdahl)
basic_machine=580-amdahl
os=-sysv
@@ -344,6 +414,10 @@
basic_machine=ns32k-sequent
os=-dynix
;;
+ c90)
+ basic_machine=c90-cray
+ os=-unicos
+ ;;
convex-c1)
basic_machine=c1-convex
os=-bsd
@@ -364,16 +438,8 @@
basic_machine=c38-convex
os=-bsd
;;
- cray | ymp)
- basic_machine=ymp-cray
- os=-unicos
- ;;
- cray2)
- basic_machine=cray2-cray
- os=-unicos
- ;;
- [cjt]90)
- basic_machine=${basic_machine}-cray+ cray | j90)
+ basic_machine=j90-cray
os=-unicos
;;
crds | unos)
@@ -388,6 +454,14 @@
decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
basic_machine=mips-dec
;;
+ decsystem10* | dec10*)
+ basic_machine=pdp10-dec
+ os=-tops10
+ ;;
+ decsystem20* | dec20*)
+ basic_machine=pdp10-dec
+ os=-tops20
+ ;;
delta | 3300 | motorola-3300 | motorola-delta \
| 3300-motorola | delta-motorola)
basic_machine=m68k-motorola
@@ -568,14 +642,6 @@
basic_machine=m68k-atari
os=-mint
;;
- mipsel*-linux*)
- basic_machine=mipsel-unknown
- os=-linux-gnu
- ;;
- mips*-linux*)
- basic_machine=mips-unknown
- os=-linux-gnu
- ;;
mips3*-*)
basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
;;
@@ -590,6 +656,10 @@
basic_machine=m68k-rom68k
os=-coff
;;
+ morphos)
+ basic_machine=powerpc-unknown
+ os=-morphos
+ ;;
msdos)
basic_machine=i386-pc
os=-msdos
@@ -662,6 +732,10 @@
np1)
basic_machine=np1-gould
;;
+ nv1)
+ basic_machine=nv1-cray
+ os=-unicosmp
+ ;;
nsr-tandem)
basic_machine=nsr-tandem
;;
@@ -669,6 +743,14 @@
basic_machine=hppa1.1-oki
os=-proelf
;;
+ or32 | or32-*)
+ basic_machine=or32-unknown
+ os=-coff
+ ;;
+ os400)
+ basic_machine=powerpc-ibm
+ os=-os400
+ ;;
OSE68000 | ose68000)
basic_machine=m68000-ericsson
os=-ose
@@ -691,42 +773,58 @@
pbb)
basic_machine=m68k-tti
;;
- pc532 | pc532-*)
+ pc532 | pc532-*)
basic_machine=ns32k-pc532
;;
- pentium | p5 | k5 | k6 | nexgen)
+ pentium | p5 | k5 | k6 | nexgen | viac3)
basic_machine=i586-pc
;;
- pentiumpro | p6 | 6x86 | athlon)
+ pentiumpro | p6 | 6x86 | athlon | athlon_*)
basic_machine=i686-pc
;;
- pentiumii | pentium2)
+ pentiumii | pentium2 | pentiumiii | pentium3)
basic_machine=i686-pc
;;
- pentium-* | p5-* | k5-* | k6-* | nexgen-*)
+ pentium4)
+ basic_machine=i786-pc
+ ;;
+ pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
pentiumpro-* | p6-* | 6x86-* | athlon-*)
basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
- pentiumii-* | pentium2-*)
+ pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
+ pentium4-*)
+ basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
pn)
basic_machine=pn-gould
;;
power) basic_machine=power-ibm
;;
ppc) basic_machine=powerpc-unknown
- ;;
+ ;;
ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
ppcle | powerpclittle | ppc-le | powerpc-little)
basic_machine=powerpcle-unknown
- ;;
+ ;;
ppcle-* | powerpclittle-*)
basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
+ ppc64) basic_machine=powerpc64-unknown
+ ;;
+ ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
+ ppc64le | powerpc64little | ppc64-le | powerpc64-little)
+ basic_machine=powerpc64le-unknown
+ ;;
+ ppc64le-* | powerpc64little-*)
+ basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
ps2)
basic_machine=i386-ibm
;;
@@ -744,10 +842,26 @@
rtpc | rtpc-*)
basic_machine=romp-ibm
;;
+ s390 | s390-*)
+ basic_machine=s390-ibm
+ ;;
+ s390x | s390x-*)
+ basic_machine=s390x-ibm
+ ;;
sa29200)
basic_machine=a29k-amd
os=-udi
;;
+ sb1)
+ basic_machine=mipsisa64sb1-unknown
+ ;;
+ sb1el)
+ basic_machine=mipsisa64sb1el-unknown
+ ;;
+ sei)
+ basic_machine=mips-sei
+ os=-seiux
+ ;;
sequent)
basic_machine=i386-sequent
;;
@@ -755,7 +869,10 @@
basic_machine=sh-hitachi
os=-hms
;;
- sparclite-wrs)
+ sh64)
+ basic_machine=sh64-unknown
+ ;;
+ sparclite-wrs | simso-wrs)
basic_machine=sparclite-wrs
os=-vxworks
;;
@@ -822,22 +939,42 @@
os=-dynix
;;
t3e)
- basic_machine=t3e-cray
+ basic_machine=alphaev5-cray
+ os=-unicos
+ ;;
+ t90)
+ basic_machine=t90-cray
os=-unicos
;;
tic54x | c54x*)
basic_machine=tic54x-unknown
os=-coff
;;
+ tic55x | c55x*)
+ basic_machine=tic55x-unknown
+ os=-coff
+ ;;
+ tic6x | c6x*)
+ basic_machine=tic6x-unknown
+ os=-coff
+ ;;
tx39)
basic_machine=mipstx39-unknown
;;
tx39el)
basic_machine=mipstx39el-unknown
;;
+ toad1)
+ basic_machine=pdp10-xkl
+ os=-tops20
+ ;;
tower | tower-32)
basic_machine=m68k-ncr
;;
+ tpf)
+ basic_machine=s390x-ibm
+ os=-tpf
+ ;;
udi29k)
basic_machine=a29k-amd
os=-udi
@@ -859,8 +996,8 @@
os=-vms
;;
vpp*|vx|vx-*)
- basic_machine=f301-fujitsu
- ;;
+ basic_machine=f301-fujitsu
+ ;;
vxworks960)
basic_machine=i960-wrs
os=-vxworks
@@ -881,13 +1018,13 @@
basic_machine=hppa1.1-winbond
os=-proelf
;;
- xmp)
- basic_machine=xmp-cray
- os=-unicos
- ;;
- xps | xps100)
+ xps | xps100)
basic_machine=xps100-honeywell
;;
+ ymp)
+ basic_machine=ymp-cray
+ os=-unicos
+ ;;
z8k-*-coff)
basic_machine=z8k-unknown
os=-sim
@@ -908,13 +1045,6 @@
op60c)
basic_machine=hppa1.1-oki
;;
- mips)
- if [ x$os = x-linux-gnu ]; then
- basic_machine=mips-unknown
- else
- basic_machine=mips-mips
- fi
- ;;
romp)
basic_machine=romp-ibm
;;
@@ -934,13 +1064,16 @@
we32k)
basic_machine=we32k-att
;;
- sh3 | sh4)
+ sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
basic_machine=sh-unknown
;;
+ sh64)
+ basic_machine=sh64-unknown
+ ;;
sparc | sparcv9 | sparcv9b)
basic_machine=sparc-sun
;;
- cydra)
+ cydra)
basic_machine=cydra-cydrome
;;
orion)
@@ -955,10 +1088,6 @@
pmac | pmac-mpw)
basic_machine=powerpc-apple
;;
- c4x*)
- basic_machine=c4x-none
- os=-coff
- ;;
*-unknown)
# Make sure to match an already-canonicalized machine name.
;;
@@ -1014,15 +1143,19 @@
| -aos* \
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
| -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
- | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
+ | -hiux* | -386bsd* | -knetbsd* | -netbsd* | -openbsd* | -kfreebsd* | -freebsd* | -riscix* \
| -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+ | -chorusos* | -chorusrdb* \
| -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
- | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
- | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
+ | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
+ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
| -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
- | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* | -os2*)
+ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
+ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
+ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
+ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
-qnx*)
@@ -1034,8 +1167,10 @@
;;
esac
;;
+ -nto-qnx*)
+ ;;
-nto*)
- os=-nto-qnx
+ os=`echo $os | sed -e 's|nto|nto-qnx|'`
;;
-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
| -windows* | -osx | -abug | -netware* | -os9* | -beos* \
@@ -1044,6 +1179,9 @@
-mac*)
os=`echo $os | sed -e 's|mac|macos|'`
;;
+ -linux-dietlibc)
+ os=-linux-dietlibc
+ ;;
-linux*)
os=`echo $os | sed -e 's|linux|linux-gnu|'`
;;
@@ -1056,6 +1194,9 @@
-opened*)
os=-openedition
;;
+ -os400*)
+ os=-os400
+ ;;
-wince*)
os=-wince
;;
@@ -1074,14 +1215,23 @@
-acis*)
os=-aos
;;
+ -atheos*)
+ os=-atheos
+ ;;
+ -syllable*)
+ os=-syllable
+ ;;
-386bsd)
os=-bsd
;;
-ctix* | -uts*)
os=-sysv
;;
+ -nova*)
+ os=-rtmk-nova
+ ;;
-ns2 )
- os=-nextstep2
+ os=-nextstep2
;;
-nsk*)
os=-nsk
@@ -1093,6 +1243,9 @@
-sinix*)
os=-sysv4
;;
+ -tpf*)
+ os=-tpf
+ ;;
-triton*)
os=-sysv3
;;
@@ -1120,8 +1273,14 @@
-xenix)
os=-xenix
;;
- -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
- os=-mint
+ -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+ os=-mint
+ ;;
+ -aros*)
+ os=-aros
+ ;;
+ -kaos*)
+ os=-kaos
;;
-none)
;;
@@ -1154,10 +1313,14 @@
arm*-semi)
os=-aout
;;
+ c4x-* | tic4x-*)
+ os=-coff
+ ;;
+ # This must come before the *-dec entry.
pdp10-*)
os=-tops20
;;
- pdp11-*)
+ pdp11-*)
os=-none
;;
*-dec | vax-*)
@@ -1184,6 +1347,9 @@
mips*-*)
os=-elf
;;
+ or32-*)
+ os=-coff
+ ;;
*-tti) # must be before sparc entry or we get the wrong os.
os=-sysv3
;;
@@ -1247,19 +1413,19 @@
*-next)
os=-nextstep3
;;
- *-gould)
+ *-gould)
os=-sysv
;;
- *-highlevel)
+ *-highlevel)
os=-bsd
;;
*-encore)
os=-bsd
;;
- *-sgi)
+ *-sgi)
os=-irix
;;
- *-siemens)
+ *-siemens)
os=-sysv4
;;
*-masscomp)
@@ -1328,10 +1494,16 @@
-mvs* | -opened*)
vendor=ibm
;;
+ -os400*)
+ vendor=ibm
+ ;;
-ptx*)
vendor=sequent
;;
- -vxsim* | -vxworks*)
+ -tpf*)
+ vendor=ibm
+ ;;
+ -vxsim* | -vxworks* | -windiss*)
vendor=wrs
;;
-aux*)
@@ -1346,6 +1518,9 @@
-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
vendor=atari
;;
+ -vos*)
+ vendor=stratus
+ ;;
esac
basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
;;
--- progsreiserfs-0.3.0.4.orig/debian/changelog
+++ progsreiserfs-0.3.0.4/debian/changelog
@@ -0,0 +1,73 @@
+progsreiserfs (0.3.0.4-3) unstable; urgency=low
+
+ * Re-apply patch fs-args-fix to accept dummy -a and -y opts, it got lost
+ in the dpatch-ification of progsreiserfs (closes: #237718)
+ * Re-apply patch to link to the local libdal, which means libreiserfs should
+ now build again properly. (closes: #237709)
+
+ -- Timshel Knoll-Miller <timshel@debian.org> Mon, 15 Mar 2004 08:33:26 +1100
+
+progsreiserfs (0.3.0.4-2) unstable; urgency=low
+
+ * Build libreiserfs0.3-udeb for use in debian-installer.
+ (Requires Build-Depends: debhelper (>= 4.2)) (closes: #236218)
+ * Don't have progsreiserfs Suggests: non-existent progsreiserfs-doc package.
+ (closes: #182016)
+ * Added mkfs-speling.dpatch to fix speling error in mkfs.reiserfs.
+ (closes: #233742)
+ * Update to Policy 3.6.1.
+ * debian/rules: pull in new config.guess & config.sub when running "clean".
+
+ -- Timshel Knoll-Miller <timshel@debian.org> Wed, 10 Mar 2004 11:15:23 +1100
+
+progsreiserfs (0.3.0.4-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Timshel Knoll <timshel@debian.org> Tue, 21 Jan 2003 00:23:49 +1100
+
+progsreiserfs (0.3.0.3-6) unstable; urgency=low
+
+ * Fixed more sparc compile issues
+ (really really REALLY closes: #172790 - I've tested it this time!)
+
+ -- Timshel Knoll <timshel@debian.org> Tue, 17 Dec 2002 01:23:57 +1100
+
+progsreiserfs (0.3.0.3-5) unstable; urgency=low
+
+ * include/reiserfs/{hashes,key,reiserfs}.h, libreiserfs/tools.c:+ Fixed other #include's of <sys/int_types.h> on sparc!!
+ (really closes: #172790)
+ * debian/control.in: Standards-Version: 3.5.8
+ + Always build with gcc -g
+
+ -- Timshel Knoll <timshel@debian.org> Mon, 16 Dec 2002 15:05:25 +1100
+
+progsreiserfs (0.3.0.3-4) unstable; urgency=low
+
+ * include/reiserfs/key.h: don't #include <sys/int_types.h> when building on
+ sparc, it doesn't exist. #include <sys/int_types.h> (this should fix the
+ build failure on sparc) (closes: #172790)
+
+ -- Timshel Knoll <timshel@debian.org> Fri, 13 Dec 2002 08:47:08 +1100
+
+progsreiserfs (0.3.0.3-3) unstable; urgency=low
+
+ * debian/control: Replace versioned Build-Depends: on automake with
+ automake1.4 (closes: #166392)
+
+ -- Timshel Knoll <timshel@debian.org> Thu, 7 Nov 2002 11:05:19 +1100
+
+progsreiserfs (0.3.0.3-2) unstable; urgency=low
+
+ * Added bogus -a and -y flags to fsck.reiserfs (closes: #161447)
+
+ -- Timshel Knoll <timshel@debian.org> Sat, 21 Sep 2002 15:48:12 +1000
+
+progsreiserfs (0.3.0.3-1) unstable; urgency=low
+
+ * Initial Release (closes: #144620).
+
+ -- Timshel Knoll <timshel@debian.org> Wed, 11 Sep 2002 00:37:56 +1000
+
+
--- progsreiserfs-0.3.0.4.orig/debian/control.in
+++ progsreiserfs-0.3.0.4/debian/control.in
@@ -0,0 +1,101 @@
+Source: progsreiserfs@BINPKGVER@
+Section: admin
+Priority: optional
+Maintainer: Timshel Knoll-Miller <timshel@debian.org>
+Standards-Version: 3.6.1
+Build-Depends: debhelper (>= 4.2.0), automake1.4, uuid-dev, dpatch
+
+Package: progsreiserfs@BINPKGVER@
+Architecture: any
+Section: admin
+Priority: extra
+Depends: ${shlibs:Depends}+Conflicts: reiserfsprogs
+Provides: reiserfsprogs
+Description: Tools for manipulating ReiserFS filesystems
+ progsreiserfs is a collection of tools for manipulating
+ ReiserFS filesystems. There are tools to create, check,
+ resize, tune and copy ReiserFS filesystems.
+ .
+ These tools differ from the standard Namesys ReiserFS tools
+ in that they use libreiserfs to do their work.
+
+Package: libreiserfs@SHAREDLIBPKGVER@
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}+Suggests: progsreiserfs, libreiserfs@LIBPKGVER@-dev, parted
+Provides: libreiserfs
+Replaces: libreiserfs@LIBPKGVER@-udeb
+Description: ReiserFS filesystem access and manipulation library, shared libraries
+ libreiserfs is a library for ReiserFS filesystem access and
+ manipulation. The primary goal is to develop a fully
+ functional library which may be linked from other projects
+ which need ReiserFS filesystem access. GNU Parted can
+ currently use libreiserfs, other programs which may include
+ GNU GRUB, Yaboot, partimage and EVMS. . This package
+ contains the shared libraries for libreiserfs. They are
+ needed for the ReiserFS utility programs in the
+ progsreiserfs package, as well as to use any other
+ libreiserfs - using program (eg. the ReiserFS functionality
+ of GNU Parted).
+
+Package: libreiserfs@LIBPKGVER@-udeb
+Architecture: any
+Section: debian-installer
+Priority: extra
+Depends: libc-udeb
+XC-Package-Type: udeb
+Description: ReiserFS filesystem access and manipulation library
+ libreiserfs is a library for ReiserFS filesystem access and
+ manipulation. The primary goal is to develop a fully
+ functional library which may be linked from other projects
+ which need ReiserFS filesystem access. GNU Parted can
+ currently use libreiserfs, other programs which may include
+ GNU GRUB, Yaboot, partimage and EVMS. This package contains
+ a cut-down version of the shared libraries with no
+ documentation for use in the Debian installer. This gives
+ ReiserFS support to Parted.
+
+Package: libreiserfs@LIBPKGVER@-dev
+Architecture: any
+Section: devel
+Depends: libc6-dev, libreiserfs@SHAREDLIBPKGVER@ (= ${Source-Version})+Suggests: progsreiserfs@BINPKGVER@ (= ${Source-Version})+Conflicts: libreiserfs-dev
+Replaces: libreiserfs-dev
+Provides: libreiserfs-dev
+Description: ReiserFS filesystem access and manipulation library - development files
+ libreiserfs is a library for ReiserFS filesystem access and
+ manipulation. The primary goal is to develop a fully
+ functional library which may be linked from other projects
+ which need ReiserFS filesystem access. GNU Parted can
+ currently use libreiserfs, other programs which may include
+ GNU GRUB, Yaboot, partimage and EVMS.
+ .
+ This package contains the header files and static libraries
+ for libreiserfs. They are needed for doing development with
+ libreiserfs.
+
+Package: libreiserfs@LIBPKGVER@-dbg
+Architecture: any
+Section: devel
+Priority: extra
+Depends: libreiserfs@SHAREDLIBPKGVER@ (= ${Source-Version}), libreiserfs@LIBPKGVER@-dev (= ${Source-Version})+Conflicts: libreiserfs-dbg
+Replaces: libreiserfs-dbg
+Provides: libreiserfs-dbg
+Description: ReiserFS filesystem access and manipulation library - debug version
+ libreiserfs is a library for ReiserFS filesystem access and
+ manipulation. The primary goal is to develop a fully
+ functional library which may be linked from other projects
+ which need ReiserFS filesystem access. GNU Parted can
+ currently use libreiserfs, other programs which may include
+ GNU GRUB, Yaboot, partimage and EVMS.
+ .
+ This package contains the debugging static libraries for
+ libreiserfs, which is needed for debugging programs linked
+ with libreiserfs. The debugging libraries are installed as
+ /usr/lib/libdal_g.a and /usr/lib/libreiserfs_g.a. You need
+ to link specifically with them if you want to debug your
+ programs.
--- progsreiserfs-0.3.0.4.orig/debian/copyright
+++ progsreiserfs-0.3.0.4/debian/copyright
@@ -0,0 +1,29 @@
+This package was debianized by Timshel Knoll <timshel@debian.org> on
+Tue, 10 Sep 2002 23:57:44 +1000.
+
+It was downloaded from http://reiserfs.linux.kiev.ua/
+
+Upstream Author: Yury Umanets <torque@ukrpost.net>
+
+Copyright:
+
+ Copyright (C) 2001, 2002 Yury Umanets
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+On Debian GNU/Linux systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
+
+ -- Timshel Knoll <timshel@debian.org> Tue, 10 Sep 2002 23:57:44 +1000
--- progsreiserfs-0.3.0.4.orig/debian/libreiserfs-dev.docs
+++ progsreiserfs-0.3.0.4/debian/libreiserfs-dev.docs
@@ -0,0 +1 @@
+doc/API
--- progsreiserfs-0.3.0.4.orig/debian/libreiserfs-dev.files
+++ progsreiserfs-0.3.0.4/debian/libreiserfs-dev.files
@@ -0,0 +1,5 @@
+usr/lib/lib*.a
+usr/lib/lib*.la
+usr/lib/lib*.so
+usr/include
+usr/share/aclocal/progsreiserfs.m4
--- progsreiserfs-0.3.0.4.orig/debian/libreiserfs.files
+++ progsreiserfs-0.3.0.4/debian/libreiserfs.files
@@ -0,0 +1 @@
+lib/lib*.so.*
--- progsreiserfs-0.3.0.4.orig/debian/progsreiserfs.docs
+++ progsreiserfs-0.3.0.4/debian/progsreiserfs.docs
@@ -0,0 +1,4 @@
+NEWS
+README
+THANKS
+TODO
--- progsreiserfs-0.3.0.4.orig/debian/progsreiserfs.files
+++ progsreiserfs-0.3.0.4/debian/progsreiserfs.files
@@ -0,0 +1,2 @@
+sbin
+usr/share/man/man8
--- progsreiserfs-0.3.0.4.orig/debian/rules
+++ progsreiserfs-0.3.0.4/debian/rules
@@ -0,0 +1,401 @@
+#!/usr/bin/make -f
+# progsreiserfs debian/rules
+#
+# This file is used by dpkg-buildpackage to build the progsreiserfs packages. # To build a package, run `dpkg-buildpackage' or `debuild' from the
+# parent directory. (You may need to specify `-rfakeroot' to
+# dpkg-buildpackage if you are not running it as root ...)
+#
+# $Id: rules,v 1.4 2002/12/16 04:06:12 timshel Exp $
+#
+# Copyright (C) 1999, 2000, 2001, 2002 Timshel Knoll
+# Licensed under the terms of the GNU General Public License
+#
+# Based (a long time ago) on parted's debian/rules, which in turn is based on
+# `Sample debian/rules that uses debhelper' from dh_make,
+# GNU Copyright (C) 1997 to 1999 by Joey Hess
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+# This is the debhelper compatability version to use.
+export DH_COMPAT=3
+
+# This has to be exported to make some magic below work.
+export DH_OPTIONS
+
+# The name of the library package. This will be lib$(LIBPKG), so for "libreiserfs",
+# this should be "reiserfs"
+LIBPKG = reiserfs
+
+# The version of the debian package, used in naming the udeb
+DEBPKGVER = $(shell dpkg-parsechangelog | sed -n -e '/^Version: /{s///;p;q;}')+
+# The library package version, ie. version 0.2 will build package
+# libparted0.2, libparted0.2-dev etc.
+# When incrementing this because of a new library SONAME, add an 'a' to the
+# end if there isn't already one, otherwise increment the letter that is
+# already there.
+# When incrementing this, also set DEPVER to the current package version.
+LIBPKGVER = 0.3
+
+# The name of the main binary package
+BINPKG = progsreiserfs
+
+# Append the LIBPKGVER to non-lib package names? This is useful when building
+# packages of the development versions of parted (eg. to build a parted1.5
+# package)
+# BINPKGVER = $(LIBPKGVER)
+
+# The first version of the package to build with the current LIBPKGVER
+# This should be changed to the current version when LIBPKGVER is changed ...
+DEPVER = 0.3.0
+
+# This is the library's soname. The build will fail if this is wrong, since
+# if the soname has changed we need to update stuff ...
+LIBSONAME = 0
+
+# This is for the version for the shared library
+SHAREDLIBPKGVER = $(LIBPKGVER)-$(LIBSONAME)
+
+# The list of sed substitutions we need to do when generating files ...
+# if you put `x' in here somewhere, the substitution `s/@x@/$(x)/'
+# will be done ...
+SUBSTS = LIBPKGVER BINPKGVER DEPVER LIBSONAME SHAREDLIBPKGVER
+
+# Files which are generated by this script ...
+# You will probably need to change this depending on what files your package
+# needs ...
+GENFILES = debian/control debian/shlibs.local \
+ debian/lib$(LIBPKG)$(SHAREDLIBPKGVER).files \
+ debian/lib$(LIBPKG)$(LIBPKGVER)-dev.files \
+ debian/lib$(LIBPKG)$(LIBPKGVER)-dev.docs
+
+
+ifneq (, $(BINPKGVER))
+GENFILES += debian/$(BINPKG)$(BINPKGVER).files \
+ debian/$(BINPKG)$(BINPKGVER)-bf.manpages \
+ debian/$(BINPKG)$(BINPKGVER)-doc.files \
+ debian/$(BINPKG)$(BINPKGVER)-doc.docs \
+ debian/$(BINPKG)$(BINPKGVER)-doc.postinst \
+ debian/$(BINPKG)$(BINPKGVER)-doc.prerm
+endif
+
+ifeq (, $(DEB_BUILD_ARCH))
+DEB_BUILD_ARCH = $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+endif
+
+ifeq (, $(DEB_BUILD_GNU_TYPE))
+DEB_BUILD_GNU_TYPE = $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+endif
+
+ifeq (, $(DEB_HOST_GNU_TYPE))
+DEB_HOST_GNU_TYPE = $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+endif
+
+ifeq (, $(ARCH))
+ARCH = $(DEB_BUILD_ARCH)
+endif
+
+ifeq (, $(CFLAGS))
+CFLAGS = -g
+UDEB_CFLAGS = -g
+
+ifeq (, $(findstring noopt, $(DEB_BUILD_OPTIONS)))
+CFLAGS += -O2
+UDEB_CFLAGS += -Os
+else
+CFLAGS += -O0
+UDEB_CFLAGS += -O0
+endif
+endif
+
+# This builds a substitution list for sed based on the SUBSTS variable
+# and the variables whose names SUBSTS contains ...
+SUBSTLIST = $(foreach subst, $(SUBSTS), s/@$(subst)@/$($(subst))/g;)
+
+# Pattern rules:
+
+# How to generate various files ...
+debian/%: debian/%.in debian/rules
+ sed -e '$(SUBSTLIST)' < $< > $@
+
+# This puts the lib$(LIBPKG)* packaging files in their right places
+debian/lib$(LIBPKG)$(SHAREDLIBPKGVER)%: debian/lib$(LIBPKG)%
+ cp $< $@
+
+debian/lib$(LIBPKG)$(LIBPKGVER)%: debian/lib$(LIBPKG)%
+ cp $< $@
+
+debian/$(BINPKG)$(BINPKGVER)%: debian/$(BINPKG)%
+ cp $< $@
+
+# by default, do something sane ...
+default: echo-vars
+
+echo-vars:
+ @echo "Try: debian/rules [configure|build|install|binary|binary-arch|binary-indep|clean]"
+ @echo "CFLAGS: $(CFLAGS)"
+ @echo "UDEB_CFLAGS: $(UDEB_CFLAGS)"
+ @echo "DEB_BUILD_ARCH: $(DEB_BUILD_ARCH)"
+ @echo "DEB_BUILD_GNU_TYPE: $(DEB_BUILD_GNU_TYPE)"
+ @echo "DEB_HOST_GNU_TYPE: $(DEB_HOST_GNU_TYPE)"
+ @echo "LIBSONAME: $(LIBSONAME)"
+ @echo "LIBPKGVER: $(LIBPKGVER)"
+ @echo "BINPKGVER: $(BINPKGVER)"
+ @echo "GENFILES: $(GENFILES)"
+ @echo "SUBSTLIST: $(SUBSTLIST)"
+
+packaging-files: $(GENFILES)
+
+configure: patch-stamp packaging-files build/configure-stamp
+build/configure-stamp:
+ dh_testdir
+ [ -d build ] || mkdir build
+
+ifneq (, $(findstring debug, $(DEB_BUILD_OPTIONS)))
+ @echo "warning: option \`debug' in \$$DEB_BUILD_OPTIONS: building with gcc option \`-g'" >&2
+endif
+
+# Add here commands to configure the package.
+# Install executables to /sbin ...
+ cd build && CFLAGS="$(CFLAGS)" ../configure --prefix=/usr \
+ --sbindir=/sbin --mandir=\$${prefix}/share/man \+ --infodir=\$${prefix}/share/info --enable-shared \+ --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
+
+ touch $@
+
+configure-udeb: packaging-files build-udeb/configure-stamp
+build-udeb/configure-stamp:
+ dh_testdir
+ [ -d build-udeb ] || mkdir build-udeb
+
+ifneq (, $(findstring debug, $(DEB_BUILD_OPTIONS)))
+ @echo "warning: option \`debug' in \$$DEB_BUILD_OPTIONS: building with gcc option \`-g'" >&2
+endif
+
+# Add here commands to configure the package.
+# Install executables to /sbin ...
+ cd build-udeb && CFLAGS="$(UDEB_CFLAGS)" ../configure --prefix=/usr \
+ --sbindir=/sbin --mandir=\$${prefix}/share/man \+ --infodir=\$${prefix}/share/info --enable-shared \+ --disable-static --disable-debug \
+ --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
+
+ touch $@
+
+configure-dbg: packaging-files build-dbg/configure-stamp
+build-dbg/configure-stamp:
+ dh_testdir
+ [ -d build-dbg ] || mkdir build-dbg
+
+# Add here commands to configure the package.
+ cd build-dbg && CFLAGS="-g $(CFLAGS)" ../configure --prefix=/usr \
+ --enable-debug --disable-shared --build=$(DEB_BUILD_GNU_TYPE) \
+ --host=$(DEB_HOST_GNU_TYPE)
+
+ touch $@
+
+build: packaging-files configure build/build-stamp
+build/build-stamp:
+ dh_testdir
+
+# Add here commands to compile the package.
+ $(MAKE) -C build
+
+ touch $@
+
+build-udeb: packaging-files configure-udeb build-udeb/build-stamp
+build-udeb/build-stamp:
+ dh_testdir
+
+# Add here commands to compile the package.
+# Don't need to build headers or doco rubbish, just the library ...
+# Note: this assumes that the library source code is in the
+# lib(x) directory, change this if it isn't ...
+ $(MAKE) -C build-udeb/libdal
+ $(MAKE) -C build-udeb/libreiserfs
+
+ touch $@
+
+build-dbg: packaging-files configure-dbg build-dbg/build-stamp
+build-dbg/build-stamp:
+ dh_testdir
+
+# Add here commands to compile the package.
+# Don't need to build headers or doco rubbish, just the library ...
+# Note: this assumes that the library source code is in the
+# lib(x) directory, change this if it isn't ...
+ $(MAKE) -C build-dbg/libdal
+ $(MAKE) -C build-dbg/libreiserfs
+
+ touch $@
+
+clean: unpatch packaging-files autotools
+ dh_testdir
+ dh_testroot
+
+# Add here commands to clean up after the build process
+ rm -rf build build-udeb build-dbg
+
+# Remove all debian/lib$(LIBPKG)*.* except for lib$(LIBPKG).*,
+# lib$(LIBPKG)-dev.* and lib$(LIBPKG)$(LIBPKGVER)*
+ @for file in debian/lib$(LIBPKG)*; do \
+ file="`basename $$file`"; \
+ case "$$file" in \
+ lib$(LIBPKG).*|lib$(LIBPKG)-dev.*|lib$(LIBPKG)$(SHAREDLIBPKGVER).*| \
+ lib$(LIBPKG)$(LIBPKGVER)-dev.*|lib$(LIBPKG)$(LIBPKGVER)-dbg.*) \
+ ;; \
+ *) \
+ echo "rm -rf \"debian/$$file\""; \
+ rm -rf "debian/$$file" ;; \
+ esac; \
+ done
+
+ -$(MAKE) distclean
+
+ dh_clean
+
+autotools:
+ -test -r /usr/share/misc/config.sub && \
+ cp -f /usr/share/misc/config.sub config.sub
+ -test -r /usr/share/misc/config.guess && \
+ cp -f /usr/share/misc/config.guess config.guess
+
+install: DH_OPTIONS=-Nlib$(LIBPKG)$(LIBPKGVER)-dbg
+install: build
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ dh_installdirs
+
+ $(MAKE) -C build install DESTDIR=$(CURDIR)/debian/tmp
+
+# We need to do 2 things here:
+# 1. Check that $(LIBSONAME) is actually what the library's SONAME is
+# 2. Fix the lib(whatever).so symlink to point to /lib/lib(whatever).so.x.x.x
+# rather than being relative & pointing to the current directory
+ @(cd debian/tmp/usr/lib; \
+ for lib in dal reiserfs ; do \
+ SONAME=`ls lib$${lib}-$(LIBPKGVER).so.*.*.* | \+ sed -e 's/^.*\.so\.\([0-9]\+\)\..*$$/\1/'`; \
+ if [ "$(LIBSONAME)" -ne "$$SONAME" ]; then \
+ echo " *** error: debian/rules thinks that lib$${lib} is" \+ "version $(LIBSONAME)" >&2; \
+ echo " *** library is actually version $$SONAME. These should" \
+ "be the same." >&2; \
+ echo " *** Change the value of LIBSONAME to $$SONAME in" \
+ "debian/rules, and" >&2; \
+ echo " *** while you're there, bump the value of LIBPKGVER and" \
+ "also set"; \
+ echo " *** DEPVER to the current version of the package that" \
+ "you are building." >&2; \
+ exit 1; \
+ fi; \
+ ln -sf /lib/`readlink lib$${lib}.so` lib$${lib}.so; \+ done)
+
+# Make sure the shared libs are in /lib (otherwise there's no point
+# installing the executable to /sbin ...) :-)
+ mkdir -p debian/tmp/lib
+ mv debian/tmp/usr/lib/*.so.* debian/tmp/lib
+
+ dh_movefiles
+
+# Remove all empty directories under debian/tmp
+# The `sort -r' makes sure that the dir `x/y' is removed before `x'
+ rmdir --ignore-fail-on-non-empty `find debian/tmp -type d | sort -r`
+
+ @if [ -d debian/tmp ]; then \
+ echo " *** WARNING: files exists in debian/tmp after" \
+ "dh_movefiles!!!" >&2; \
+ echo " *** Maybe the debian/*.files files need updating ..." >&2; \
+ fi
+
+install-udeb: DH_OPTIONS=-plib$(LIBPKG)$(LIBPKGVER)-udeb
+install-udeb: build-udeb
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ dh_installdirs
+
+ $(MAKE) -C build-udeb/libdal install \
+ DESTDIR=$(CURDIR)/debian/lib$(LIBPKG)$(LIBPKGVER)-udeb
+ $(MAKE) -C build-udeb/libreiserfs install \
+ DESTDIR=$(CURDIR)/debian/lib$(LIBPKG)$(LIBPKGVER)-udeb
+
+ rm -f debian/lib$(LIBPKG)$(LIBPKGVER)-udeb/usr/lib/*.la
+ rm -f debian/lib$(LIBPKG)$(LIBPKGVER)-udeb/usr/lib/*.so
+
+install-dbg: DH_OPTIONS=-plib$(LIBPKG)$(LIBPKGVER)-dbg
+install-dbg: build-dbg
+ dh_testdir
+ dh_testroot
+ dh_clean -k -plib$(LIBPKG)$(LIBPKGVER)-dbg
+ dh_installdirs
+
+ install -D -m644 build-dbg/libdal/.libs/libdal.a \
+ debian/lib$(LIBPKG)$(LIBPKGVER)-dbg/usr/lib/libdal_g.a
+ install -D -m644 build-dbg/libreiserfs/.libs/libreiserfs.a \
+ debian/lib$(LIBPKG)$(LIBPKGVER)-dbg/usr/lib/libreiserfs_g.a
+
+# This single target is used to build all the packages, all at once, or
+# one at a time. So keep in mind: any options passed to commands here will
+# affect _all_ packages. Anything you want to only affect one package
+# should be put in another target, such as the install target.
+binary-common:
+ dh_testdir
+ dh_testroot
+# dh_installdebconf
+ dh_installdocs
+ dh_installexamples
+ dh_installmenu
+# dh_installemacsen
+# dh_installpam
+# dh_installinit
+ dh_installcron
+ dh_installman
+ dh_installinfo
+ dh_installchangelogs ChangeLog
+ dh_strip
+ dh_link
+ dh_compress
+ dh_fixperms
+ dh_makeshlibs -V 'lib$(LIBPKG)$(SHAREDLIBPKGVER) (>= $(DEPVER))'
+ dh_installdeb
+# dh_perl
+ dh_shlibdeps -l$(CURDIR)/debian/lib$(LIBPKG)$(SHAREDLIBPKGVER)/lib
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+# Build architecture independant packages using the common target.
+# Unfortunately, we still need to build since the info file has to be
+# re-generated before installation and the locales need to be installed :-(
+binary-indep: build install
+# (Uncomment this next line if you have such packages.)
+# $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
+
+# Build architecture dependant packages using the common target.
+binary-arch: build build-udeb build-dbg install install-udeb install-dbg
+ $(MAKE) -f debian/rules DH_OPTIONS="-a" binary-common
+
+# Any other binary targets build just one binary package at a time.
+binary-%-dbg: build-dbg install-dbg
+ $(MAKE) -f debian/rules DH_OPTIONS="-p$*-dbg" binary-common
+
+binary-%-udeb: build-udeb install-udeb
+ $(MAKE) -f debian/rules DH_OPTIONS="-p$*-udeb" binary-common
+
+binary-%: build install
+ $(MAKE) -f debian/rules DH_OPTIONS=-p$* binary-common
+
+binary: binary-arch binary-indep
+
+.PHONY: configure configure-udeb configure-bf configure-dbg
+.PHONY: build build-udeb build-bf build-dbg
+.PHONY: install install-bf install-dbg install-i18n
+.PHONY: clean binary-indep binary-arch binary
+.PHONY: packaging-files autotools
+
+include /usr/share/dpatch/dpatch.make
--- progsreiserfs-0.3.0.4.orig/debian/shlibs.local.in
+++ progsreiserfs-0.3.0.4/debian/shlibs.local.in
@@ -0,0 +1,2 @@
+libdal @LIBSONAME@ libreiserfs@SHAREDLIBPKGVER@ (= ${Source-Version})+libreiserfs @LIBSONAME@ libreiserfs@SHAREDLIBPKGVER@ (= ${Source-Version})--- progsreiserfs-0.3.0.4.orig/debian/control
+++ progsreiserfs-0.3.0.4/debian/control
@@ -0,0 +1,101 @@
+Source: progsreiserfs
+Section: admin
+Priority: optional
+Maintainer: Timshel Knoll-Miller <timshel@debian.org>
+Standards-Version: 3.6.1
+Build-Depends: debhelper (>= 4.2.0), automake1.4, uuid-dev, dpatch
+
+Package: progsreiserfs
+Architecture: any
+Section: admin
+Priority: extra
+Depends: ${shlibs:Depends}+Conflicts: reiserfsprogs
+Provides: reiserfsprogs
+Description: Tools for manipulating ReiserFS filesystems
+ progsreiserfs is a collection of tools for manipulating
+ ReiserFS filesystems. There are tools to create, check,
+ resize, tune and copy ReiserFS filesystems.
+ .
+ These tools differ from the standard Namesys ReiserFS tools
+ in that they use libreiserfs to do their work.
+
+Package: libreiserfs0.3-0
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}+Suggests: progsreiserfs, libreiserfs0.3-dev, parted
+Provides: libreiserfs
+Replaces: libreiserfs0.3-udeb
+Description: ReiserFS filesystem access and manipulation library, shared libraries
+ libreiserfs is a library for ReiserFS filesystem access and
+ manipulation. The primary goal is to develop a fully
+ functional library which may be linked from other projects
+ which need ReiserFS filesystem access. GNU Parted can
+ currently use libreiserfs, other programs which may include
+ GNU GRUB, Yaboot, partimage and EVMS. . This package
+ contains the shared libraries for libreiserfs. They are
+ needed for the ReiserFS utility programs in the
+ progsreiserfs package, as well as to use any other
+ libreiserfs - using program (eg. the ReiserFS functionality
+ of GNU Parted).
+
+Package: libreiserfs0.3-udeb
+Architecture: any
+Section: debian-installer
+Priority: extra
+Depends: libc-udeb
+XC-Package-Type: udeb
+Description: ReiserFS filesystem access and manipulation library
+ libreiserfs is a library for ReiserFS filesystem access and
+ manipulation. The primary goal is to develop a fully
+ functional library which may be linked from other projects
+ which need ReiserFS filesystem access. GNU Parted can
+ currently use libreiserfs, other programs which may include
+ GNU GRUB, Yaboot, partimage and EVMS. This package contains
+ a cut-down version of the shared libraries with no
+ documentation for use in the Debian installer. This gives
+ ReiserFS support to Parted.
+
+Package: libreiserfs0.3-dev
+Architecture: any
+Section: devel
+Depends: libc6-dev, libreiserfs0.3-0 (= ${Source-Version})+Suggests: progsreiserfs (= ${Source-Version})+Conflicts: libreiserfs-dev
+Replaces: libreiserfs-dev
+Provides: libreiserfs-dev
+Description: ReiserFS filesystem access and manipulation library - development files
+ libreiserfs is a library for ReiserFS filesystem access and
+ manipulation. The primary goal is to develop a fully
+ functional library which may be linked from other projects
+ which need ReiserFS filesystem access. GNU Parted can
+ currently use libreiserfs, other programs which may include
+ GNU GRUB, Yaboot, partimage and EVMS.
+ .
+ This package contains the header files and static libraries
+ for libreiserfs. They are needed for doing development with
+ libreiserfs.
+
+Package: libreiserfs0.3-dbg
+Architecture: any
+Section: devel
+Priority: extra
+Depends: libreiserfs0.3-0 (= ${Source-Version}), libreiserfs0.3-dev (= ${Source-Version})+Conflicts: libreiserfs-dbg
+Replaces: libreiserfs-dbg
+Provides: libreiserfs-dbg
+Description: ReiserFS filesystem access and manipulation library - debug version
+ libreiserfs is a library for ReiserFS filesystem access and
+ manipulation. The primary goal is to develop a fully
+ functional library which may be linked from other projects
+ which need ReiserFS filesystem access. GNU Parted can
+ currently use libreiserfs, other programs which may include
+ GNU GRUB, Yaboot, partimage and EVMS.
+ .
+ This package contains the debugging static libraries for
+ libreiserfs, which is needed for debugging programs linked
+ with libreiserfs. The debugging libraries are installed as
+ /usr/lib/libdal_g.a and /usr/lib/libreiserfs_g.a. You need
+ to link specifically with them if you want to debug your
+ programs.
--- progsreiserfs-0.3.0.4.orig/debian/shlibs.local
+++ progsreiserfs-0.3.0.4/debian/shlibs.local
@@ -0,0 +1,2 @@
+libdal 0 libreiserfs0.3-0 (= ${Source-Version})+libreiserfs 0 libreiserfs0.3-0 (= ${Source-Version})--- progsreiserfs-0.3.0.4.orig/debian/libreiserfs0.3-0.files
+++ progsreiserfs-0.3.0.4/debian/libreiserfs0.3-0.files
@@ -0,0 +1 @@
+lib/lib*.so.*
--- progsreiserfs-0.3.0.4.orig/debian/libreiserfs0.3-dev.files
+++ progsreiserfs-0.3.0.4/debian/libreiserfs0.3-dev.files
@@ -0,0 +1,5 @@
+usr/lib/lib*.a
+usr/lib/lib*.la
+usr/lib/lib*.so
+usr/include
+usr/share/aclocal/progsreiserfs.m4
--- progsreiserfs-0.3.0.4.orig/debian/libreiserfs0.3-dev.docs
+++ progsreiserfs-0.3.0.4/debian/libreiserfs0.3-dev.docs
@@ -0,0 +1 @@
+doc/API
--- progsreiserfs-0.3.0.4.orig/debian/patches/mkfs-speling.dpatch
+++ progsreiserfs-0.3.0.4/debian/patches/mkfs-speling.dpatch
@@ -0,0 +1,50 @@
+#! /bin/sh -e
+## mkreiser-errmsg-clarify.dpatch by Timshel Knoll-Miller <timshel@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+if [ $# -lt 1 ]; then
+ echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+ exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"+
+case "$1" in
+ -patch) patch -p1 ${patch_opts} < $0;;+ -unpatch) patch -R -p1 ${patch_opts} < $0;;+ *)
+ echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+ exit 1;;
+esac
+
+exit 0
+
+@DPATCH@
+diff -urNad /home/timshel/src/debian/dpatch/progsreiserfs/progsreiserfs-0.3.0.4/libreiserfs/core.c progsreiserfs-0.3.0.4/libreiserfs/core.c
+--- /home/timshel/src/debian/dpatch/progsreiserfs/progsreiserfs-0.3.0.4/libreiserfs/core.c 2003-01-10 17:39:49.000000000 +1100
++++ progsreiserfs-0.3.0.4/libreiserfs/core.c 2004-03-10 09:42:59.000000000 +1100
+@@ -1518,7 +1518,8 @@
+ }
+
+ /* Format functions */
+-static char *reiserfs_long_formats[] = {"reiserfs 3.5", "unknown", "reiserfs 3.6"};++static char *reiserfs_long_formats[] = {"reiser filesystem (v3.5)", "unknown",++ "reiser filesystem (v3.6)"};
+ static char *reiserfs_short_formats[] = {"3.5", "unknown", "3.6"};+
+ int reiserfs_fs_format(reiserfs_fs_t *fs) {+diff -urNad /home/timshel/src/debian/dpatch/progsreiserfs/progsreiserfs-0.3.0.4/progsreiserfs/mkfs.reiserfs/mkfs.reiserfs.c progsreiserfs-0.3.0.4/progsreiserfs/mkfs.reiserfs/mkfs.reiserfs.c
+--- /home/timshel/src/debian/dpatch/progsreiserfs/progsreiserfs-0.3.0.4/progsreiserfs/mkfs.reiserfs/mkfs.reiserfs.c 2002-05-06 03:13:41.000000000 +1000
++++ progsreiserfs-0.3.0.4/progsreiserfs/mkfs.reiserfs/mkfs.reiserfs.c 2004-03-10 09:42:59.000000000 +1100
+@@ -397,7 +397,7 @@
+ choice = 'y';
+ if (!quiet) {+ if (!(choice = progs_user_choose("ynYN", _("Please select (y/n) "), +- _("All data on %s%s will be lost. Do you realy want to create %s "++ _("All data on %s%s will be lost. Do you really want to create %s "+ "(y/n) "), host_dev, mess_part, reiserfs_fs_long_format_str(format))))
+ goto error_free_journal_dal;
+ }
--- progsreiserfs-0.3.0.4.orig/debian/patches/00list
+++ progsreiserfs-0.3.0.4/debian/patches/00list
@@ -0,0 +1,4 @@
+mkfs-speling
+fsck-args-fix
+bugs-content
+local-libdal-dep
--- progsreiserfs-0.3.0.4.orig/debian/patches/fsck-args-fix.dpatch
+++ progsreiserfs-0.3.0.4/debian/patches/fsck-args-fix.dpatch
@@ -0,0 +1,73 @@
+#! /bin/sh -e
+## fsck-args-fix.dpatch by Timshel Knoll-Miller <timshel@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+if [ $# -lt 1 ]; then
+ echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+ exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"+
+case "$1" in
+ -patch) patch -p1 ${patch_opts} < $0;;+ -unpatch) patch -R -p1 ${patch_opts} < $0;;+ *)
+ echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+ exit 1;;
+esac
+
+exit 0
+
+@DPATCH@
+diff -urNad /home/timshel/src/debian/dpatch/progsreiserfs/progsreiserfs-0.3.0.4/progsreiserfs/fsck.reiserfs/fsck.reiserfs.c progsreiserfs-0.3.0.4/progsreiserfs/fsck.reiserfs/fsck.reiserfs.c
+--- /home/timshel/src/debian/dpatch/progsreiserfs/progsreiserfs-0.3.0.4/progsreiserfs/fsck.reiserfs/fsck.reiserfs.c 2002-05-06 02:54:26.000000000 +1000
++++ progsreiserfs-0.3.0.4/progsreiserfs/fsck.reiserfs/fsck.reiserfs.c 2004-03-15 08:07:35.000000000 +1100
+@@ -28,6 +28,8 @@
+ # define _(String) (String)
+ #endif
+
++#define DEBIAN /* Undefine if not building on a Debian system */
++
+ extern long gathering_leaves(reiserfs_block_t *node, void *data);
+
+ static void fsck_print_usage(void) {+@@ -58,9 +60,14 @@
+ bindtextdomain(PACKAGE, LOCALEDIR);
+ textdomain(PACKAGE);
+ #endif
+-
++
++#ifndef DEBIAN
+ while ((choice = getopt_long_only(argc, argv, "uvj:n",
+ long_options, (int *)0)) != EOF)
++#else /* DEBIAN */
++ while ((choice = getopt_long_only(argc, argv, "uvj:nay",
++ long_options, (int *)0)) != EOF)
++#endif /* DEBIAN */
+ {+ switch (choice) {+ case 'u': {+@@ -83,6 +90,19 @@
+ journal = 0;
+ break;
+ }
++#ifdef DEBIAN
++ case 'a' : case 'y':
++ /* Ignore these, they are simply for
++ * compatability with the boot process which
++ * calls all fsck with the -a and -y flags */
++ libreiserfs_exception_throw (EXCEPTION_WARNING,
++ EXCEPTION_UNHANDLED,
++ _("%s warning: option %c does nothing,"++ " ignored.\n"),
++ argv[0]);
++
++ break;
++#endif /* DEBIAN */
+ case '?': {+ fsck_print_usage();
+ return 0xfe;
--- progsreiserfs-0.3.0.4.orig/debian/patches/bugs-content.dpatch
+++ progsreiserfs-0.3.0.4/debian/patches/bugs-content.dpatch
@@ -0,0 +1,30 @@
+#! /bin/sh -e
+## bugs-content.dpatch by Timshel Knoll-Miller <timshel@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+if [ $# -lt 1 ]; then
+ echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+ exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"+
+case "$1" in
+ -patch) patch -p1 ${patch_opts} < $0;;+ -unpatch) patch -R -p1 ${patch_opts} < $0;;+ *)
+ echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+ exit 1;;
+esac
+
+exit 0
+
+@DPATCH@
+diff -urNad /home/timshel/src/debian/dpatch/progsreiserfs/progsreiserfs-0.3.0.4/BUGS progsreiserfs-0.3.0.4/BUGS
+--- /home/timshel/src/debian/dpatch/progsreiserfs/progsreiserfs-0.3.0.4/BUGS 2003-01-10 17:51:01.000000000 +1100
++++ progsreiserfs-0.3.0.4/BUGS 2004-03-15 08:14:28.000000000 +1100
+@@ -0,0 +1 @@
++No known bugs!
--- progsreiserfs-0.3.0.4.orig/debian/patches/local-libdal-dep.dpatch
+++ progsreiserfs-0.3.0.4/debian/patches/local-libdal-dep.dpatch
@@ -0,0 +1,37 @@
+#! /bin/sh -e
+## local-libdal-dep.dpatch by Timshel Knoll-Miller <timshel@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+if [ $# -lt 1 ]; then
+ echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+ exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"+
+case "$1" in
+ -patch) patch -p1 ${patch_opts} < $0;;+ -unpatch) patch -R -p1 ${patch_opts} < $0;;+ *)
+ echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+ exit 1;;
+esac
+
+exit 0
+
+@DPATCH@
+diff -urNad /home/timshel/src/debian/dpatch/progsreiserfs/progsreiserfs-0.3.0.4/libreiserfs/Makefile.am progsreiserfs-0.3.0.4/libreiserfs/Makefile.am
+--- /home/timshel/src/debian/dpatch/progsreiserfs/progsreiserfs-0.3.0.4/libreiserfs/Makefile.am 2002-05-04 00:57:30.000000000 +1000
++++ progsreiserfs-0.3.0.4/libreiserfs/Makefile.am 2004-03-15 08:35:30.000000000 +1100
+@@ -2,7 +2,7 @@
+
+ includedir = -I$(top_srcdir)/include
+ lib_LTLIBRARIES = libreiserfs.la
+-libreiserfs_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE)
++libreiserfs_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) -L$(top_builddir)/libdal/.libs
+
+ libreiserfs_la_LIBADD = $(top_builddir)/libdal/libdal.la
+