OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/automake?expand=0&rev=10

2009-03-17 15:44:42 +00:00
parent 5cf475295a
commit 60f70a5b55
7 changed files with 210 additions and 42 deletions
--- a/automake-SuSE.patch
+++ b/automake-SuSE.patch
@@ -1,6 +1,6 @@
 --- lib/config.guess
 +++ lib/config.guess
-@@ -139,6 +139,16 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` |
+@@ -139,6 +139,16 @@
 UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
 
@@ -17,7 +17,7 @@
 # Note: order is significant - the case branches are not exclusive.
 
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
-@@ -840,13 +850,13 @@ EOF
+@@ -853,13 +863,13 @@
 	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
 	    | grep -q __ARM_EABI__
 	then
@@ -34,7 +34,7 @@
 	exit ;;
     cris:Linux:*:*)
 	echo cris-axis-linux-gnu
-@@ -855,16 +865,16 @@ EOF
+@@ -868,16 +878,16 @@
 	echo crisv32-axis-linux-gnu
 	exit ;;
     frv:Linux:*:*)
@@ -55,7 +55,7 @@
 	exit ;;
     mips:Linux:*:*)
 	eval $set_cc_for_build
-@@ -887,7 +897,7 @@ EOF
+@@ -900,7 +910,7 @@
 		s: ::g
 		p
 	    }'`"
@@ -64,7 +64,7 @@
 	;;
     mips64:Linux:*:*)
 	eval $set_cc_for_build
-@@ -910,16 +920,16 @@ EOF
+@@ -923,16 +933,16 @@
 		s: ::g
 		p
 	    }'`"
@@ -85,13 +85,16 @@
 	exit ;;
     alpha:Linux:*:*)
 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-@@ -933,39 +943,39 @@ EOF
+@@ -946,7 +956,7 @@
         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}
-+	echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu${LIBC}
+ 	echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu${LIBC}
 	exit ;;
+     padre:Linux:*:*)
+ 	echo sparc-unknown-linux-gnu
+@@ -954,34 +964,34 @@
     parisc:Linux:*:* | hppa:Linux:*:*)
 	# Look for CPU level
 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
@@ -135,7 +138,7 @@
 	exit ;;
     i*86:Linux:*:*)
 	# The BFD linker knows what the default object file format is, so
-@@ -980,18 +990,18 @@ EOF
+@@ -996,15 +1006,15 @@
 				    p'`
         case "$ld_supported_targets" in
 	  elf32-i386)
@@ -146,10 +149,6 @@
 -		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
 +		echo "${UNAME_MACHINE}-${VENDOR}-linux-gnuaout"
 		exit ;;
- 	  coff-i386)
-		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
-+		echo "${UNAME_MACHINE}-${VENDOR}-linux-gnucoff"
- 		exit ;;
 	  "")
 		# Either a pre-BFD a.out linker (linux-gnuoldld) or
 		# one that does not give us useful --help.
@@ -158,7 +157,7 @@
 		exit ;;
 	esac
 	# Determine whether the default compiler is a.out or elf
-@@ -1025,7 +1035,7 @@ EOF
+@@ -1038,7 +1048,7 @@
 		p
 	    }'`"
 	test x"${LIBC}" != x && {
@@ -167,3 +166,111 @@
 		exit
 	}
 	test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
+@@ -1063,16 +1073,16 @@
+ 	echo ${UNAME_MACHINE}-pc-os2-emx
+ 	exit ;;
+     i*86:XTS-300:*:STOP)
+-	echo ${UNAME_MACHINE}-unknown-stop
+	echo ${UNAME_MACHINE}-${VENDOR}-stop
+ 	exit ;;
+     i*86:atheos:*:*)
+-	echo ${UNAME_MACHINE}-unknown-atheos
+	echo ${UNAME_MACHINE}-${VENDOR}-atheos
+ 	exit ;;
+     i*86:syllable:*:*)
+ 	echo ${UNAME_MACHINE}-pc-syllable
+ 	exit ;;
+     i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
+-	echo i386-unknown-lynxos${UNAME_RELEASE}
+	echo i386-${VENDOR}-lynxos${UNAME_RELEASE}
+ 	exit ;;
+     i*86:*DOS:*:*)
+ 	echo ${UNAME_MACHINE}-pc-msdosdjgpp
+@@ -1092,7 +1102,7 @@
+ 	    *Pentium)	     UNAME_MACHINE=i586 ;;
+ 	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
+ 	esac
+-	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
+	echo ${UNAME_MACHINE}-${VENDOR}-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
+ 	exit ;;
+     i*86:*:3.2:*)
+ 	if test -f /usr/options/cb.name; then
+@@ -1128,7 +1138,7 @@
+ 	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
+ 	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
+ 	else # Add other i860-SVR4 vendors below as they are discovered.
+-	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
+	  echo i860-${VENDOR}-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
+ 	fi
+ 	exit ;;
+     mini*:CTIX:SYS*5:*)
+@@ -1155,19 +1165,19 @@
+         /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+           && { echo i486-ncr-sysv4; exit; } ;;
+     m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
+-	echo m68k-unknown-lynxos${UNAME_RELEASE}
+	echo m68k-${VENDOR}-lynxos${UNAME_RELEASE}
+ 	exit ;;
+     mc68030:UNIX_System_V:4.*:*)
+ 	echo m68k-atari-sysv4
+ 	exit ;;
+     TSUNAMI:LynxOS:2.*:*)
+-	echo sparc-unknown-lynxos${UNAME_RELEASE}
+	echo sparc-${VENDOR}-lynxos${UNAME_RELEASE}
+ 	exit ;;
+     rs6000:LynxOS:2.*:*)
+-	echo rs6000-unknown-lynxos${UNAME_RELEASE}
+	echo rs6000-${VENDOR}-lynxos${UNAME_RELEASE}
+ 	exit ;;
+     PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
+-	echo powerpc-unknown-lynxos${UNAME_RELEASE}
+	echo powerpc-${VENDOR}-lynxos${UNAME_RELEASE}
+ 	exit ;;
+     SM[BE]S:UNIX_SV:*:*)
+ 	echo mips-dde-sysv${UNAME_RELEASE}
+@@ -1217,7 +1227,7 @@
+ 	if [ -d /usr/nec ]; then
+ 	        echo mips-nec-sysv${UNAME_RELEASE}
+ 	else
+-	        echo mips-unknown-sysv${UNAME_RELEASE}
+	        echo mips-${VENDOR}-sysv${UNAME_RELEASE}
+ 	fi
+         exit ;;
+     BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
+@@ -1298,13 +1308,13 @@
+ 	else
+ 	    UNAME_MACHINE="$cputype"
+ 	fi
+-	echo ${UNAME_MACHINE}-unknown-plan9
+	echo ${UNAME_MACHINE}-${VENDOR}-plan9
+ 	exit ;;
+     *:TOPS-10:*:*)
+-	echo pdp10-unknown-tops10
+	echo pdp10-${VENDOR}-tops10
+ 	exit ;;
+     *:TENEX:*:*)
+-	echo pdp10-unknown-tenex
+	echo pdp10-${VENDOR}-tenex
+ 	exit ;;
+     KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
+ 	echo pdp10-dec-tops20
+@@ -1313,16 +1323,16 @@
+ 	echo pdp10-xkl-tops20
+ 	exit ;;
+     *:TOPS-20:*:*)
+-	echo pdp10-unknown-tops20
+	echo pdp10-${VENDOR}-tops20
+ 	exit ;;
+     *:ITS:*:*)
+-	echo pdp10-unknown-its
+	echo pdp10-${VENDOR}-its
+ 	exit ;;
+     SEI:*:*:SEIUX)
+         echo mips-sei-seiux${UNAME_RELEASE}
+ 	exit ;;
+     *:DragonFly:*:*)
+-	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+	echo ${UNAME_MACHINE}-${VENDOR}-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+ 	exit ;;
+     *:*VMS:*:*)
+     	UNAME_MACHINE=`(uname -p) 2>/dev/null`