diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/patches/050_autotools-config.patch | 63 |
1 files changed, 40 insertions, 23 deletions
diff --git a/debian/patches/050_autotools-config.patch b/debian/patches/050_autotools-config.patch index 2498f81..f331302 100644 --- a/debian/patches/050_autotools-config.patch +++ b/debian/patches/050_autotools-config.patch @@ -1,8 +1,14 @@ Subject: Update config.guess and config.sub From: Tatsuya Kinoshita <tats@debian.org> +Updated with autotools-dev 20130810.1. + +Note that Debian package uses autotools-dev dh addon, +dh_autotools-dev_updateconfig and dh_autotools-dev_restoreconfig, +instead of this patch. + diff --git a/config.guess b/config.guess -index 51fab47..120cc0d 100755 +index 51fab47..b79252d 100755 --- a/config.guess +++ b/config.guess @@ -1,13 +1,12 @@ @@ -13,7 +19,7 @@ index 51fab47..120cc0d 100755 +# Copyright 1992-2013 Free Software Foundation, Inc. -timestamp='2004-03-12' -+timestamp='2013-05-16' ++timestamp='2013-06-10' # 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 @@ -746,7 +752,7 @@ index 51fab47..120cc0d 100755 3050*:HI-UX:*:*) eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c -@@ -699,340 +720,339 @@ EOF +@@ -699,340 +720,345 @@ EOF exit (0); } EOF @@ -1153,6 +1159,12 @@ index 51fab47..120cc0d 100755 + ppc:Linux:*:*) + echo powerpc-unknown-linux-${LIBC} + exit ;; ++ ppc64le:Linux:*:*) ++ echo powerpc64le-unknown-linux-${LIBC} ++ exit ;; ++ ppcle:Linux:*:*) ++ echo powerpcle-unknown-linux-${LIBC} ++ exit ;; s390:Linux:*:* | s390x:Linux:*:*) - echo ${UNAME_MACHINE}-ibm-linux - exit 0 ;; @@ -1294,7 +1306,7 @@ index 51fab47..120cc0d 100755 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 -@@ -1040,15 +1060,16 @@ EOF +@@ -1040,15 +1066,16 @@ EOF else echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} fi @@ -1314,7 +1326,7 @@ index 51fab47..120cc0d 100755 i*86:*:3.2:*) if test -f /usr/options/cb.name; then UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name` -@@ -1066,73 +1087,86 @@ EOF +@@ -1066,73 +1093,86 @@ EOF else echo ${UNAME_MACHINE}-pc-sysv32 fi @@ -1428,7 +1440,7 @@ index 51fab47..120cc0d 100755 *:SINIX-*:*:*) if uname -p 2>/dev/null >/dev/null ; then UNAME_MACHINE=`(uname -p) 2>/dev/null` -@@ -1140,68 +1174,99 @@ EOF +@@ -1140,68 +1180,99 @@ EOF else echo ns32k-sni-sysv fi @@ -1554,7 +1566,7 @@ index 51fab47..120cc0d 100755 *:procnto*:*:* | *:QNX:[0123456789]*:*) UNAME_PROCESSOR=`uname -p` if test "$UNAME_PROCESSOR" = "x86"; then -@@ -1209,22 +1274,28 @@ EOF +@@ -1209,22 +1280,28 @@ EOF UNAME_MACHINE=pc fi echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} @@ -1589,7 +1601,7 @@ index 51fab47..120cc0d 100755 *:Plan9:*:*) # "uname -m" is not consistent, so use $cputype instead. 386 # is converted to i386 for consistency with other x86 -@@ -1235,36 +1306,55 @@ EOF +@@ -1235,36 +1312,55 @@ EOF UNAME_MACHINE="$cputype" fi echo ${UNAME_MACHINE}-unknown-plan9 @@ -1658,7 +1670,7 @@ index 51fab47..120cc0d 100755 eval $set_cc_for_build cat >$dummy.c <<EOF #ifdef _SEQUENT_ -@@ -1282,16 +1372,16 @@ main () +@@ -1282,16 +1378,16 @@ main () #include <sys/param.h> printf ("m68k-sony-newsos%s\n", #ifdef NEWSOS4 @@ -1679,7 +1691,7 @@ index 51fab47..120cc0d 100755 #endif #if defined (hp300) && !defined (hpux) -@@ -1380,11 +1470,12 @@ main () +@@ -1380,11 +1476,12 @@ main () } EOF @@ -1694,7 +1706,7 @@ index 51fab47..120cc0d 100755 # Convex versions that predate uname can use getsysinfo(1) -@@ -1393,22 +1484,22 @@ then +@@ -1393,22 +1490,22 @@ then case `getsysinfo -f cpu_type` in c1*) echo c1-convex-bsd @@ -1722,7 +1734,7 @@ index 51fab47..120cc0d 100755 esac fi -@@ -1419,7 +1510,9 @@ This script, last modified $timestamp, has failed to recognize +@@ -1419,7 +1516,9 @@ This script, last modified $timestamp, has failed to recognize the operating system you are using. It is advised that you download the most up to date version of the config scripts from @@ -1734,7 +1746,7 @@ index 51fab47..120cc0d 100755 If the version you run ($0) is already up to date, please send the following data and any information you think might be diff --git a/config.sub b/config.sub -index ba33103..8b612ab 100755 +index ba33103..9633db7 100755 --- a/config.sub +++ b/config.sub @@ -1,42 +1,40 @@ @@ -1745,7 +1757,7 @@ index ba33103..8b612ab 100755 +# Copyright 1992-2013 Free Software Foundation, Inc. -timestamp='2004-03-12' -+timestamp='2013-04-24' ++timestamp='2013-08-10' -# This file is (in principle) common to ALL GNU software. -# The presence of a machine in this file suggests that SOME GNU software @@ -1923,12 +1935,13 @@ index ba33103..8b612ab 100755 | 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 \ + | arc | arceb \ + | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ + | avr | avr32 \ + | be32 | be64 \ + | bfin \ - | c4x | clipper \ ++ | c4x | c8051 | clipper \ | d10v | d30v | dlx | dsp16xx \ - | fr30 | frv \ + | epiphany \ @@ -2054,7 +2067,7 @@ index ba33103..8b612ab 100755 + | be32-* | be64-* \ + | bfin-* | bs2000-* \ + | c[123]* | c30-* | [cjt]90-* | c4x-* \ -+ | clipper-* | craynv-* | cydra-* \ ++ | c8051-* | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ - | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \ @@ -2268,7 +2281,8 @@ index ba33103..8b612ab 100755 + os=-mingw64 + ;; mingw32) - basic_machine=i386-pc +- basic_machine=i386-pc ++ basic_machine=i686-pc os=-mingw32 ;; + mingw32ce) @@ -2297,7 +2311,7 @@ index ba33103..8b612ab 100755 + basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` + ;; + msys) -+ basic_machine=i386-pc ++ basic_machine=i686-pc + os=-msys + ;; mvs) @@ -2610,7 +2624,7 @@ index ba33103..8b612ab 100755 *-acorn) os=-riscix1.2 ;; -@@ -1325,9 +1543,21 @@ case $basic_machine in +@@ -1325,9 +1543,24 @@ case $basic_machine in arm*-semi) os=-aout ;; @@ -2620,6 +2634,9 @@ index ba33103..8b612ab 100755 + c4x-* | tic4x-*) + os=-coff + ;; ++ c8051-*) ++ os=-elf ++ ;; + hexagon-*) + os=-elf + ;; @@ -2635,7 +2652,7 @@ index ba33103..8b612ab 100755 # This must come before the *-dec entry. pdp10-*) os=-tops20 -@@ -1346,19 +1576,22 @@ case $basic_machine in +@@ -1346,19 +1579,22 @@ case $basic_machine in ;; m68000-sun) os=-sunos3 @@ -2661,7 +2678,7 @@ index ba33103..8b612ab 100755 or32-*) os=-coff ;; -@@ -1371,9 +1604,15 @@ case $basic_machine in +@@ -1371,9 +1607,15 @@ case $basic_machine in *-be) os=-beos ;; @@ -2677,7 +2694,7 @@ index ba33103..8b612ab 100755 *-wec) os=-proelf ;; -@@ -1476,7 +1715,7 @@ case $basic_machine in +@@ -1476,7 +1718,7 @@ case $basic_machine in -sunos*) vendor=sun ;; @@ -2686,7 +2703,7 @@ index ba33103..8b612ab 100755 vendor=ibm ;; -beos*) -@@ -1539,7 +1778,7 @@ case $basic_machine in +@@ -1539,7 +1781,7 @@ case $basic_machine in esac echo $basic_machine$os |