--- tvtime-1.0.2.orig/config.guess +++ tvtime-1.0.2/config.guess @@ -1,13 +1,12 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. +# Copyright 1992-2013 Free Software Foundation, Inc. -timestamp='2004-11-12' +timestamp='2013-05-16' # 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 -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, but @@ -16,24 +15,22 @@ # 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. +# along with this program; if not, see . # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -# Originally written by Per Bothner . -# Please send patches to . Submit a context -# diff and a properly formatted ChangeLog entry. +# the same distribution terms that you use for the rest of that +# program. This Exception is an additional permission under section 7 +# of the GNU General Public License, version 3 ("GPLv3"). +# +# Originally written by Per Bothner. # -# This script attempts to guess a canonical system name similar to -# config.sub. If it succeeds, it prints the system name on stdout, and -# exits with 0. Otherwise, it exits with 1. +# You can get the latest version of this script from: +# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD # -# The plan is that this can be called by configure scripts if you -# don't specify an explicit build system type. +# Please send patches with a ChangeLog entry to config-patches@gnu.org. + me=`echo "$0" | sed -e 's,.*/,,'` @@ -53,8 +50,7 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 -Free Software Foundation, Inc. +Copyright 1992-2013 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -66,11 +62,11 @@ while test $# -gt 0 ; do case $1 in --time-stamp | --time* | -t ) - echo "$timestamp" ; exit 0 ;; + echo "$timestamp" ; exit ;; --version | -v ) - echo "$version" ; exit 0 ;; + echo "$version" ; exit ;; --help | --h* | -h ) - echo "$usage"; exit 0 ;; + echo "$usage"; exit ;; -- ) # Stop option processing shift; break ;; - ) # Use stdin as input. @@ -104,7 +100,7 @@ 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" ; } || + { tmp=`(umask 077 && mktemp -d "$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 ; } ; @@ -123,7 +119,7 @@ ;; ,,*) CC_FOR_BUILD=$CC ;; ,*,*) CC_FOR_BUILD=$HOST_CC ;; -esac ;' +esac ; set_cc_for_build= ;' # This is needed to find uname on a Pyramid OSx when run in the BSD universe. # (ghazi@noc.rutgers.edu 1994-08-24) @@ -136,12 +132,33 @@ UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown +case "${UNAME_SYSTEM}" in +Linux|GNU|GNU/*) + # If the system lacks a compiler, then just pick glibc. + # We could probably try harder. + LIBC=gnu + + eval $set_cc_for_build + cat <<-EOF > $dummy.c + #include + #if defined(__UCLIBC__) + LIBC=uclibc + #elif defined(__dietlibc__) + LIBC=dietlibc + #else + LIBC=gnu + #endif + EOF + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` + ;; +esac + # Note: order is significant - the case branches are not exclusive. case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in *:NetBSD:*:*) # NetBSD (nbsd) targets should (where applicable) match one or - # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, + # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently # switched to ELF, *-*-netbsd* would select the old # object file format. This provides both forward @@ -158,6 +175,7 @@ arm*) machine=arm-unknown ;; sh3el) machine=shl-unknown ;; sh3eb) machine=sh-unknown ;; + sh5el) machine=sh5le-unknown ;; *) machine=${UNAME_MACHINE_ARCH}-unknown ;; esac # The Operating System including object format, if it has switched @@ -166,7 +184,7 @@ 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 + | grep -q __ELF__ then # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). # Return netbsd for either. FIX? @@ -176,7 +194,7 @@ fi ;; *) - os=netbsd + os=netbsd ;; esac # The OS release @@ -196,62 +214,34 @@ # contains redundant information, the shorter form: # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. echo "${machine}-${os}${release}" - exit 0 ;; - amd64:OpenBSD:*:*) - echo x86_64-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - amiga:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - cats:OpenBSD:*:*) - echo arm-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - hp300:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - luna88k:OpenBSD:*:*) - echo m88k-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 ;; - sgi:OpenBSD:*:*) - echo mips64-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - sun3:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; + exit ;; + *:Bitrig:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` + echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE} + exit ;; *:OpenBSD:*:*) - echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; + UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` + echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} + exit ;; *:ekkoBSD:*:*) echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} - exit 0 ;; + exit ;; + *:SolidBSD:*:*) + echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} + exit ;; macppc:MirBSD:*:*) - echo powerppc-unknown-mirbsd${UNAME_RELEASE} - exit 0 ;; + echo powerpc-unknown-mirbsd${UNAME_RELEASE} + exit ;; *:MirBSD:*:*) echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} - exit 0 ;; + exit ;; alpha:OSF1:*:*) case $UNAME_RELEASE in *4.0) UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` ;; *5.*) - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` ;; esac # According to Compaq, /usr/sbin/psrinfo has been available on @@ -297,40 +287,46 @@ # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - exit 0 ;; + # Reset EXIT trap before exiting to avoid spurious non-zero exit code. + exitcode=$? + trap '' 0 + exit $exitcode ;; 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 # of the specific Alpha model? echo alpha-pc-interix - exit 0 ;; + exit ;; 21064:Windows_NT:50:3) echo alpha-dec-winnt3.5 - exit 0 ;; + exit ;; Amiga*:UNIX_System_V:4.0:*) echo m68k-unknown-sysv4 - exit 0;; + exit ;; *:[Aa]miga[Oo][Ss]:*:*) echo ${UNAME_MACHINE}-unknown-amigaos - exit 0 ;; + exit ;; *:[Mm]orph[Oo][Ss]:*:*) echo ${UNAME_MACHINE}-unknown-morphos - exit 0 ;; + exit ;; *:OS/390:*:*) echo i370-ibm-openedition - exit 0 ;; + exit ;; *:z/VM:*:*) echo s390-ibm-zvmoe - exit 0 ;; + exit ;; *:OS400:*:*) - echo powerpc-ibm-os400 - exit 0 ;; + echo powerpc-ibm-os400 + exit ;; arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} - exit 0;; + exit ;; + arm*:riscos:*:*|arm*:RISCOS:*:*) + echo arm-unknown-riscos + exit ;; SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) echo hppa1.1-hitachi-hiuxmpp - exit 0;; + exit ;; Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. if test "`(/bin/universe) 2>/dev/null`" = att ; then @@ -338,32 +334,51 @@ else echo pyramid-pyramid-bsd fi - exit 0 ;; + exit ;; NILE*:*:*:dcosx) echo pyramid-pyramid-svr4 - exit 0 ;; + exit ;; DRS?6000:unix:4.0:6*) echo sparc-icl-nx6 - exit 0 ;; + exit ;; DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) case `/usr/bin/uname -p` in - sparc) echo sparc-icl-nx7 && exit 0 ;; + sparc) echo sparc-icl-nx7; exit ;; esac ;; + s390x:SunOS:*:*) + echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; sun4H:SunOS:5.*:*) echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; + exit ;; sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; - i86pc:SunOS:5.*:*) - echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; + exit ;; + i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) + echo i386-pc-auroraux${UNAME_RELEASE} + exit ;; + i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) + eval $set_cc_for_build + SUN_ARCH="i386" + # If there is a compiler, see if it is configured for 64-bit objects. + # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. + # This test works for both compilers. + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + SUN_ARCH="x86_64" + fi + fi + echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; sun4*:SunOS:6*:*) # According to config.sub, this is the proper way to canonicalize # SunOS6. Hard to guess exactly what SunOS6 will be like, but # it's likely to be more like Solaris than SunOS4. echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; + exit ;; sun4*:SunOS:*:*) case "`/usr/bin/arch -k`" in Series*|S4*) @@ -372,10 +387,10 @@ esac # Japanese Language versions have a version number like `4.1.3-JL'. echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` - exit 0 ;; + exit ;; sun3*:SunOS:*:*) echo m68k-sun-sunos${UNAME_RELEASE} - exit 0 ;; + exit ;; sun*:*:4.2BSD:*) UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 @@ -387,10 +402,10 @@ echo sparc-sun-sunos${UNAME_RELEASE} ;; esac - exit 0 ;; + exit ;; aushp:SunOS:*:*) echo sparc-auspex-sunos${UNAME_RELEASE} - exit 0 ;; + exit ;; # 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 @@ -400,41 +415,41 @@ # MiNT. But MiNT is downward compatible to TOS, so this should # be no problem. atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} - exit 0 ;; + echo m68k-atari-mint${UNAME_RELEASE} + exit ;; atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) echo m68k-atari-mint${UNAME_RELEASE} - exit 0 ;; + exit ;; *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} - exit 0 ;; + echo m68k-atari-mint${UNAME_RELEASE} + exit ;; milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) - echo m68k-milan-mint${UNAME_RELEASE} - exit 0 ;; + echo m68k-milan-mint${UNAME_RELEASE} + exit ;; hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) - echo m68k-hades-mint${UNAME_RELEASE} - exit 0 ;; + echo m68k-hades-mint${UNAME_RELEASE} + exit ;; *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) - echo m68k-unknown-mint${UNAME_RELEASE} - exit 0 ;; + echo m68k-unknown-mint${UNAME_RELEASE} + exit ;; m68k:machten:*:*) echo m68k-apple-machten${UNAME_RELEASE} - exit 0 ;; + exit ;; powerpc:machten:*:*) echo powerpc-apple-machten${UNAME_RELEASE} - exit 0 ;; + exit ;; RISC*:Mach:*:*) echo mips-dec-mach_bsd4.3 - exit 0 ;; + exit ;; RISC*:ULTRIX:*:*) echo mips-dec-ultrix${UNAME_RELEASE} - exit 0 ;; + exit ;; VAX*:ULTRIX*:*:*) echo vax-dec-ultrix${UNAME_RELEASE} - exit 0 ;; + exit ;; 2020:CLIX:*:* | 2430:CLIX:*:*) echo clipper-intergraph-clix${UNAME_RELEASE} - exit 0 ;; + exit ;; mips:*:*:UMIPS | mips:*:*:RISCos) eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c @@ -458,35 +473,36 @@ exit (-1); } EOF - $CC_FOR_BUILD -o $dummy $dummy.c \ - && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ - && exit 0 + $CC_FOR_BUILD -o $dummy $dummy.c && + dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` && + SYSTEM_NAME=`$dummy $dummyarg` && + { echo "$SYSTEM_NAME"; exit; } echo mips-mips-riscos${UNAME_RELEASE} - exit 0 ;; + exit ;; Motorola:PowerMAX_OS:*:*) echo powerpc-motorola-powermax - exit 0 ;; + exit ;; Motorola:*:4.3:PL8-*) echo powerpc-harris-powermax - exit 0 ;; + exit ;; Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) echo powerpc-harris-powermax - exit 0 ;; + exit ;; Night_Hawk:Power_UNIX:*:*) echo powerpc-harris-powerunix - exit 0 ;; + exit ;; m88k:CX/UX:7*:*) echo m88k-harris-cxux7 - exit 0 ;; + exit ;; m88k:*:4*:R4*) echo m88k-motorola-sysv4 - exit 0 ;; + exit ;; m88k:*:3*:R3*) echo m88k-motorola-sysv3 - exit 0 ;; + exit ;; AViiON:dgux:*:*) - # DG/UX returns AViiON for all architectures - UNAME_PROCESSOR=`/usr/bin/uname -p` + # DG/UX returns AViiON for all architectures + UNAME_PROCESSOR=`/usr/bin/uname -p` if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] then if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ @@ -499,29 +515,29 @@ else echo i586-dg-dgux${UNAME_RELEASE} fi - exit 0 ;; + exit ;; M88*:DolphinOS:*:*) # DolphinOS (SVR3) echo m88k-dolphin-sysv3 - exit 0 ;; + exit ;; M88*:*:R3*:*) # Delta 88k system running SVR3 echo m88k-motorola-sysv3 - exit 0 ;; + exit ;; XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) echo m88k-tektronix-sysv3 - exit 0 ;; + exit ;; Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) echo m68k-tektronix-bsd - exit 0 ;; + exit ;; *:IRIX*:*:*) echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` - exit 0 ;; + exit ;; ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. - echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id - exit 0 ;; # Note that: echo "'`uname -s`'" gives 'AIX ' + echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id + exit ;; # Note that: echo "'`uname -s`'" gives 'AIX ' i*86:AIX:*:*) echo i386-ibm-aix - exit 0 ;; + exit ;; ia64:AIX:*:*) if [ -x /usr/bin/oslevel ] ; then IBM_REV=`/usr/bin/oslevel` @@ -529,7 +545,7 @@ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} fi echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} - exit 0 ;; + exit ;; *:AIX:2:3) if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then eval $set_cc_for_build @@ -544,15 +560,19 @@ exit(0); } EOF - $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 - echo rs6000-ibm-aix3.2.5 + if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` + then + echo "$SYSTEM_NAME" + else + echo rs6000-ibm-aix3.2.5 + fi elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then echo rs6000-ibm-aix3.2.4 else echo rs6000-ibm-aix3.2 fi - exit 0 ;; - *:AIX:*:[45]) + exit ;; + *:AIX:*:[4567]) 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; then IBM_ARCH=rs6000 @@ -565,28 +585,28 @@ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} fi echo ${IBM_ARCH}-ibm-aix${IBM_REV} - exit 0 ;; + exit ;; *:AIX:*:*) echo rs6000-ibm-aix - exit 0 ;; + exit ;; ibmrt:4.4BSD:*|romp-ibm:BSD:*) echo romp-ibm-bsd4.4 - exit 0 ;; + exit ;; ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to - exit 0 ;; # report: romp-ibm BSD 4.3 + exit ;; # report: romp-ibm BSD 4.3 *:BOSX:*:*) echo rs6000-bull-bosx - exit 0 ;; + exit ;; DPX/2?00:B.O.S.:*:*) echo m68k-bull-sysv3 - exit 0 ;; + exit ;; 9000/[34]??:4.3bsd:1.*:*) echo m68k-hp-bsd - exit 0 ;; + exit ;; hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) echo m68k-hp-bsd4.4 - exit 0 ;; + exit ;; 9000/[34678]??:HP-UX:*:*) HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` case "${UNAME_MACHINE}" in @@ -595,52 +615,52 @@ 9000/[678][0-9][0-9]) 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}" in - 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 - 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 - 532) # CPU_PA_RISC2_0 - case "${sc_kernel_bits}" in - 32) HP_ARCH="hppa2.0n" ;; - 64) HP_ARCH="hppa2.0w" ;; + sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` + case "${sc_cpu_version}" in + 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 + 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 + 532) # CPU_PA_RISC2_0 + case "${sc_kernel_bits}" in + 32) HP_ARCH="hppa2.0n" ;; + 64) HP_ARCH="hppa2.0w" ;; '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 - esac ;; - esac + esac ;; + esac fi if [ "${HP_ARCH}" = "" ]; then eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + sed 's/^ //' << EOF >$dummy.c + + #define _HPUX_SOURCE + #include + #include - #define _HPUX_SOURCE - #include - #include - - int main () - { - #if defined(_SC_KERNEL_BITS) - long bits = sysconf(_SC_KERNEL_BITS); - #endif - long cpu = sysconf (_SC_CPU_VERSION); - - switch (cpu) - { - case CPU_PA_RISC1_0: puts ("hppa1.0"); break; - case CPU_PA_RISC1_1: puts ("hppa1.1"); break; - case CPU_PA_RISC2_0: - #if defined(_SC_KERNEL_BITS) - switch (bits) - { - case 64: puts ("hppa2.0w"); break; - case 32: puts ("hppa2.0n"); break; - default: puts ("hppa2.0"); break; - } break; - #else /* !defined(_SC_KERNEL_BITS) */ - puts ("hppa2.0"); break; - #endif - default: puts ("hppa1.0"); break; - } - exit (0); - } + int main () + { + #if defined(_SC_KERNEL_BITS) + long bits = sysconf(_SC_KERNEL_BITS); + #endif + long cpu = sysconf (_SC_CPU_VERSION); + + switch (cpu) + { + case CPU_PA_RISC1_0: puts ("hppa1.0"); break; + case CPU_PA_RISC1_1: puts ("hppa1.1"); break; + case CPU_PA_RISC2_0: + #if defined(_SC_KERNEL_BITS) + switch (bits) + { + case 64: puts ("hppa2.0w"); break; + case 32: puts ("hppa2.0n"); break; + default: puts ("hppa2.0"); break; + } break; + #else /* !defined(_SC_KERNEL_BITS) */ + puts ("hppa2.0"); break; + #endif + default: puts ("hppa1.0"); break; + } + exit (0); + } EOF (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` test -z "$HP_ARCH" && HP_ARCH=hppa @@ -648,9 +668,19 @@ 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 + eval $set_cc_for_build + + # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating + # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler + # generating 64-bit code. GNU and HP use different nomenclature: + # + # $ CC_FOR_BUILD=cc ./config.guess + # => hppa2.0w-hp-hpux11.23 + # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess + # => hppa64-hp-hpux11.23 + + if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | + grep -q __LP64__ then HP_ARCH="hppa2.0w" else @@ -658,11 +688,11 @@ fi fi echo ${HP_ARCH}-hp-hpux${HPUX_REV} - exit 0 ;; + exit ;; ia64:HP-UX:*:*) HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` echo ia64-hp-hpux${HPUX_REV} - exit 0 ;; + exit ;; 3050*:HI-UX:*:*) eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c @@ -690,332 +720,339 @@ exit (0); } EOF - $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 + $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` && + { echo "$SYSTEM_NAME"; exit; } echo unknown-hitachi-hiuxwe2 - exit 0 ;; + exit ;; 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) echo hppa1.1-hp-bsd - exit 0 ;; + exit ;; 9000/8??:4.3bsd:*:*) echo hppa1.0-hp-bsd - exit 0 ;; + exit ;; *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) echo hppa1.0-hp-mpeix - exit 0 ;; + exit ;; hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) echo hppa1.1-hp-osf - exit 0 ;; + exit ;; hp8??:OSF1:*:*) echo hppa1.0-hp-osf - exit 0 ;; + exit ;; i*86:OSF1:*:*) if [ -x /usr/sbin/sysversion ] ; then echo ${UNAME_MACHINE}-unknown-osf1mk else echo ${UNAME_MACHINE}-unknown-osf1 fi - exit 0 ;; + exit ;; parisc*:Lites*:*:*) echo hppa1.1-hp-lites - exit 0 ;; + exit ;; C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) echo c1-convex-bsd - exit 0 ;; + exit ;; C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) if getsysinfo -f scalar_acc then echo c32-convex-bsd else echo c2-convex-bsd fi - exit 0 ;; + exit ;; C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) echo c34-convex-bsd - exit 0 ;; + exit ;; C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) echo c38-convex-bsd - exit 0 ;; + exit ;; C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) echo c4-convex-bsd - exit 0 ;; + exit ;; CRAY*Y-MP:*:*:*) echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; + exit ;; CRAY*[A-Z]90:*:*:*) echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ -e 's/\.[^.]*$/.X/' - exit 0 ;; + exit ;; CRAY*TS:*:*:*) echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; + exit ;; CRAY*T3E:*:*:*) echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; + exit ;; CRAY*SV1:*:*:*) echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; + exit ;; *:UNICOS/mp:*:*) echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; + exit ;; 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 ;; + 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 ;; 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 ;; + 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 ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} - exit 0 ;; + exit ;; sparc*:BSD/OS:*:*) echo sparc-unknown-bsdi${UNAME_RELEASE} - exit 0 ;; + exit ;; *:BSD/OS:*:*) echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} - exit 0 ;; + exit ;; *:FreeBSD:*:*) - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` - exit 0 ;; + UNAME_PROCESSOR=`/usr/bin/uname -p` + case ${UNAME_PROCESSOR} in + amd64) + echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + *) + echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + esac + exit ;; i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin - exit 0 ;; - i*:MINGW*:*) + exit ;; + *:MINGW64*:*) + echo ${UNAME_MACHINE}-pc-mingw64 + exit ;; + *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 - exit 0 ;; + exit ;; + i*:MSYS*:*) + echo ${UNAME_MACHINE}-pc-msys + exit ;; + i*:windows32*:*) + # uname -m includes "-pc" on this system. + echo ${UNAME_MACHINE}-mingw32 + exit ;; i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 - exit 0 ;; - x86:Interix*:[34]*) - echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//' - exit 0 ;; + exit ;; + *:Interix*:*) + case ${UNAME_MACHINE} in + x86) + echo i586-pc-interix${UNAME_RELEASE} + exit ;; + authenticamd | genuineintel | EM64T) + echo x86_64-unknown-interix${UNAME_RELEASE} + exit ;; + IA64) + echo ia64-unknown-interix${UNAME_RELEASE} + exit ;; + esac ;; [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) echo i${UNAME_MACHINE}-pc-mks - exit 0 ;; + exit ;; + 8664:Windows_NT:*) + echo x86_64-pc-mks + exit ;; 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 i586-pc-interix - exit 0 ;; + exit ;; i*:UWIN*:*) echo ${UNAME_MACHINE}-pc-uwin - exit 0 ;; + exit ;; + amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) + echo x86_64-unknown-cygwin + exit ;; p*:CYGWIN*:*) echo powerpcle-unknown-cygwin - exit 0 ;; + exit ;; prep*:SunOS:5.*:*) echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; + exit ;; *:GNU:*:*) # the GNU system - echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` - exit 0 ;; + echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` + exit ;; *: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 ;; + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} + exit ;; i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix - exit 0 ;; + exit ;; + aarch64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + aarch64_be:Linux:*:*) + UNAME_MACHINE=aarch64_be + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + alpha:Linux:*:*) + 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 -q ld.so.1 + if test "$?" = 0 ; then LIBC="gnulibc1" ; fi + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + arc:Linux:*:* | arceb:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; arm*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; + eval $set_cc_for_build + if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ARM_EABI__ + then + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + else + if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ARM_PCS_VFP + then + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi + else + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf + fi + fi + exit ;; + avr32*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; cris:Linux:*:*) - echo cris-axis-linux-gnu - exit 0 ;; + echo ${UNAME_MACHINE}-axis-linux-${LIBC} + exit ;; crisv32:Linux:*:*) - echo crisv32-axis-linux-gnu - exit 0 ;; + echo ${UNAME_MACHINE}-axis-linux-${LIBC} + exit ;; frv:Linux:*:*) - echo frv-unknown-linux-gnu - exit 0 ;; + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + hexagon:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + i*86:Linux:*:*) + echo ${UNAME_MACHINE}-pc-linux-${LIBC} + exit ;; ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; m32r*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; m68*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; - mips:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + mips:Linux:*:* | mips64:Linux:*:*) eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c #undef CPU - #undef mips - #undef mipsel + #undef ${UNAME_MACHINE} + #undef ${UNAME_MACHINE}el #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) - CPU=mipsel + CPU=${UNAME_MACHINE}el #else #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) - CPU=mips + CPU=${UNAME_MACHINE} #else CPU= #endif #endif EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` - test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } ;; - 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 - 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:*:*) - 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 ;; + or1k:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + or32:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + padre:Linux:*:*) + echo sparc-unknown-linux-${LIBC} + exit ;; + parisc64:Linux:*:* | hppa64:Linux:*:*) + echo hppa64-unknown-linux-${LIBC} + exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in - PA7*) echo hppa1.1-unknown-linux-gnu ;; - PA8*) echo hppa2.0-unknown-linux-gnu ;; - *) echo hppa-unknown-linux-gnu ;; + PA7*) echo hppa1.1-unknown-linux-${LIBC} ;; + PA8*) echo hppa2.0-unknown-linux-${LIBC} ;; + *) echo hppa-unknown-linux-${LIBC} ;; esac - exit 0 ;; - parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-gnu - exit 0 ;; + exit ;; + ppc64:Linux:*:*) + echo powerpc64-unknown-linux-${LIBC} + exit ;; + ppc:Linux:*:*) + echo powerpc-unknown-linux-${LIBC} + exit ;; s390:Linux:*:* | s390x:Linux:*:*) - echo ${UNAME_MACHINE}-ibm-linux - exit 0 ;; + echo ${UNAME_MACHINE}-ibm-linux-${LIBC} + exit ;; sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; sh*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; sparc:Linux:*:* | sparc64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + tile*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + vax:Linux:*:*) + echo ${UNAME_MACHINE}-dec-linux-${LIBC} + exit ;; x86_64:Linux:*:*) - echo x86_64-unknown-linux-gnu - exit 0 ;; - i*86:Linux:*:*) - # 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. - # 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 targets: *// - s/ .*// - p'` - case "$ld_supported_targets" in - elf32-i386) - TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" - ;; - a.out-i386-linux) - echo "${UNAME_MACHINE}-pc-linux-gnuaout" - exit 0 ;; - coff-i386) - echo "${UNAME_MACHINE}-pc-linux-gnucoff" - 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 - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #include - #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 - 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 - ;; + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + xtensa*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; 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 ;; + exit ;; i*86:UNIX_SV:4.2MP:2.*) - # Unixware is an offshoot of SVR4, but it has its own version - # number series starting with 2... - # I am not positive that other SVR4 systems won't match this, + # Unixware is an offshoot of SVR4, but it has its own version + # number series starting with 2... + # I am not positive that other SVR4 systems won't match this, # I just have to hope. -- rms. - # Use sysv4.2uw... so that sysv4* matches it. + # Use sysv4.2uw... so that sysv4* matches it. echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} - exit 0 ;; + exit ;; 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 ;; + exit ;; i*86:XTS-300:*:STOP) echo ${UNAME_MACHINE}-unknown-stop - exit 0 ;; + exit ;; i*86:atheos:*:*) echo ${UNAME_MACHINE}-unknown-atheos - exit 0 ;; - i*86:syllable:*:*) + exit ;; + i*86:syllable:*:*) echo ${UNAME_MACHINE}-pc-syllable - exit 0 ;; - i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) + exit ;; + i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) echo i386-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; + exit ;; i*86:*DOS:*:*) echo ${UNAME_MACHINE}-pc-msdosdjgpp - exit 0 ;; + exit ;; 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 @@ -1023,15 +1060,16 @@ else echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} fi - exit 0 ;; - i*86:*:5:[78]*) + exit ;; + i*86:*:5:[678]*) + # UnixWare 7.x, OpenUNIX and OpenServer 6. 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 ;; + exit ;; i*86:*:3.2:*) if test -f /usr/options/cb.name; then UNAME_REL=`sed -n 's/.*Version //p' /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 fi - exit 0 ;; + exit ;; mini*:CTIX:SYS*5:*) # "miniframe" echo m68010-convergent-sysv - exit 0 ;; + exit ;; mc68k:UNIX:SYSTEM5:3.51m) echo m68k-convergent-sysv - exit 0 ;; + exit ;; M680?0:D-NIX:5.3:*) echo m68k-diab-dnix - exit 0 ;; + exit ;; M68*:*:R3V[5678]*:*) - test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; + test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;; 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 | S7501*:*:4.0:3.0) OS_REL='' test -r /etc/.relid \ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && echo i486-ncr-sysv4.3${OS_REL} && exit 0 + && { echo i486-ncr-sysv4.3${OS_REL}; exit; } /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ - && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;; + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && echo i486-ncr-sysv4 && exit 0 ;; + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && { echo i486-ncr-sysv4; exit; } ;; + NCR*:*:4.2:* | MPRAS*:*:4.2:*) + OS_REL='.3' + test -r /etc/.relid \ + && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && { echo i486-ncr-sysv4.3${OS_REL}; exit; } + /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } + /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) echo m68k-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; + exit ;; mc68030:UNIX_System_V:4.*:*) echo m68k-atari-sysv4 - exit 0 ;; + exit ;; TSUNAMI:LynxOS:2.*:*) echo sparc-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; + exit ;; rs6000:LynxOS:2.*:*) echo rs6000-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; - PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) + exit ;; + PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) echo powerpc-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; + exit ;; SM[BE]S:UNIX_SV:*:*) echo mips-dde-sysv${UNAME_RELEASE} - exit 0 ;; + exit ;; RM*:ReliantUNIX-*:*:*) echo mips-sni-sysv4 - exit 0 ;; + exit ;; RM*:SINIX-*:*:*) echo mips-sni-sysv4 - exit 0 ;; + exit ;; *:SINIX-*:*:*) if uname -p 2>/dev/null >/dev/null ; then UNAME_MACHINE=`(uname -p) 2>/dev/null` @@ -1123,69 +1174,99 @@ else echo ns32k-sni-sysv fi - exit 0 ;; - PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort - # says - echo i586-unisys-sysv4 - exit 0 ;; + exit ;; + PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort + # says + echo i586-unisys-sysv4 + exit ;; *:UNIX_System_V:4*:FTX*) # From Gerald Hewes . # How about differentiating between stratus architectures? -djm echo hppa1.1-stratus-sysv4 - exit 0 ;; + exit ;; *:*:*:FTX*) # From seanf@swdc.stratus.com. echo i860-stratus-sysv4 - exit 0 ;; + exit ;; + i*86:VOS:*:*) + # From Paul.Green@stratus.com. + echo ${UNAME_MACHINE}-stratus-vos + exit ;; *:VOS:*:*) # From Paul.Green@stratus.com. echo hppa1.1-stratus-vos - exit 0 ;; + exit ;; mc68*:A/UX:*:*) echo m68k-apple-aux${UNAME_RELEASE} - exit 0 ;; + exit ;; news*:NEWS-OS:6*:*) echo mips-sony-newsos6 - exit 0 ;; + exit ;; R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) if [ -d /usr/nec ]; then - echo mips-nec-sysv${UNAME_RELEASE} + echo mips-nec-sysv${UNAME_RELEASE} else - echo mips-unknown-sysv${UNAME_RELEASE} + echo mips-unknown-sysv${UNAME_RELEASE} fi - exit 0 ;; + exit ;; BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. echo powerpc-be-beos - exit 0 ;; + exit ;; BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. echo powerpc-apple-beos - exit 0 ;; + exit ;; BePC:BeOS:*:*) # BeOS running on Intel PC compatible. echo i586-pc-beos - exit 0 ;; + exit ;; + BePC:Haiku:*:*) # Haiku running on Intel PC compatible. + echo i586-pc-haiku + exit ;; + x86_64:Haiku:*:*) + echo x86_64-unknown-haiku + exit ;; SX-4:SUPER-UX:*:*) echo sx4-nec-superux${UNAME_RELEASE} - exit 0 ;; + exit ;; SX-5:SUPER-UX:*:*) echo sx5-nec-superux${UNAME_RELEASE} - exit 0 ;; + exit ;; SX-6:SUPER-UX:*:*) echo sx6-nec-superux${UNAME_RELEASE} - exit 0 ;; + exit ;; + SX-7:SUPER-UX:*:*) + echo sx7-nec-superux${UNAME_RELEASE} + exit ;; + SX-8:SUPER-UX:*:*) + echo sx8-nec-superux${UNAME_RELEASE} + exit ;; + SX-8R:SUPER-UX:*:*) + echo sx8r-nec-superux${UNAME_RELEASE} + exit ;; Power*:Rhapsody:*:*) echo powerpc-apple-rhapsody${UNAME_RELEASE} - exit 0 ;; + exit ;; *:Rhapsody:*:*) echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} - exit 0 ;; + exit ;; *:Darwin:*:*) UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown - case $UNAME_PROCESSOR in - *86) UNAME_PROCESSOR=i686 ;; - unknown) UNAME_PROCESSOR=powerpc ;; - esac + eval $set_cc_for_build + if test "$UNAME_PROCESSOR" = unknown ; then + UNAME_PROCESSOR=powerpc + fi + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + case $UNAME_PROCESSOR in + i386) UNAME_PROCESSOR=x86_64 ;; + powerpc) UNAME_PROCESSOR=powerpc64 ;; + esac + fi + fi echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} - exit 0 ;; + exit ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) UNAME_PROCESSOR=`uname -p` if test "$UNAME_PROCESSOR" = "x86"; then @@ -1193,22 +1274,28 @@ UNAME_MACHINE=pc fi echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} - exit 0 ;; + exit ;; *:QNX:*:4*) echo i386-pc-qnx - exit 0 ;; + exit ;; + NEO-?:NONSTOP_KERNEL:*:*) + echo neo-tandem-nsk${UNAME_RELEASE} + exit ;; + NSE-*:NONSTOP_KERNEL:*:*) + echo nse-tandem-nsk${UNAME_RELEASE} + exit ;; NSR-?:NONSTOP_KERNEL:*:*) echo nsr-tandem-nsk${UNAME_RELEASE} - exit 0 ;; + exit ;; *:NonStop-UX:*:*) echo mips-compaq-nonstopux - exit 0 ;; + exit ;; BS2000:POSIX*:*:*) echo bs2000-siemens-sysv - exit 0 ;; + exit ;; DS/*:UNIX_System_V:*:*) echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} - exit 0 ;; + exit ;; *:Plan9:*:*) # "uname -m" is not consistent, so use $cputype instead. 386 # is converted to i386 for consistency with other x86 @@ -1219,46 +1306,55 @@ UNAME_MACHINE="$cputype" fi echo ${UNAME_MACHINE}-unknown-plan9 - exit 0 ;; + exit ;; *:TOPS-10:*:*) echo pdp10-unknown-tops10 - exit 0 ;; + exit ;; *:TENEX:*:*) echo pdp10-unknown-tenex - exit 0 ;; + exit ;; KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) echo pdp10-dec-tops20 - exit 0 ;; + exit ;; XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) echo pdp10-xkl-tops20 - exit 0 ;; + exit ;; *:TOPS-20:*:*) echo pdp10-unknown-tops20 - exit 0 ;; + exit ;; *:ITS:*:*) echo pdp10-unknown-its - exit 0 ;; + exit ;; SEI:*:*:SEIUX) - echo mips-sei-seiux${UNAME_RELEASE} - exit 0 ;; + echo mips-sei-seiux${UNAME_RELEASE} + exit ;; *:DragonFly:*:*) echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` - exit 0 ;; + exit ;; *:*VMS:*:*) - UNAME_MACHINE=`(uname -p) 2>/dev/null` + UNAME_MACHINE=`(uname -p) 2>/dev/null` case "${UNAME_MACHINE}" in - A*) echo alpha-dec-vms && exit 0 ;; - I*) echo ia64-dec-vms && exit 0 ;; - V*) echo vax-dec-vms && exit 0 ;; + A*) echo alpha-dec-vms ; exit ;; + I*) echo ia64-dec-vms ; exit ;; + V*) echo vax-dec-vms ; exit ;; esac ;; *:XENIX:*:SysV) echo i386-pc-xenix - exit 0 ;; + exit ;; + i*86:skyos:*:*) + echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' + exit ;; + i*86:rdos:*:*) + echo ${UNAME_MACHINE}-pc-rdos + exit ;; + i*86:AROS:*:*) + echo ${UNAME_MACHINE}-pc-aros + exit ;; + x86_64:VMkernel:*:*) + echo ${UNAME_MACHINE}-unknown-esx + exit ;; 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 < printf ("m68k-sony-newsos%s\n", #ifdef NEWSOS4 - "4" + "4" #else - "" + "" #endif - ); exit (0); + ); exit (0); #endif #endif #if defined (__arm) && defined (__acorn) && defined (__unix) - printf ("arm-acorn-riscix"); exit (0); + printf ("arm-acorn-riscix\n"); exit (0); #endif #if defined (hp300) && !defined (hpux) @@ -1374,11 +1470,12 @@ } EOF -$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0 +$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && + { echo "$SYSTEM_NAME"; exit; } # Apollos put the system type in the environment. -test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; } +test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } # Convex versions that predate uname can use getsysinfo(1) @@ -1387,22 +1484,22 @@ case `getsysinfo -f cpu_type` in c1*) echo c1-convex-bsd - exit 0 ;; + exit ;; c2*) if getsysinfo -f scalar_acc then echo c32-convex-bsd else echo c2-convex-bsd fi - exit 0 ;; + exit ;; c34*) echo c34-convex-bsd - exit 0 ;; + exit ;; c38*) echo c38-convex-bsd - exit 0 ;; + exit ;; c4*) echo c4-convex-bsd - exit 0 ;; + exit ;; esac fi @@ -1413,7 +1510,9 @@ the operating system you are using. It is advised that you download the most up to date version of the config scripts from - ftp://ftp.gnu.org/pub/gnu/config/ + http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD +and + http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD If the version you run ($0) is already up to date, please send the following data and any information you think might be --- tvtime-1.0.2.orig/config.sub +++ tvtime-1.0.2/config.sub @@ -1,42 +1,40 @@ #! /bin/sh # Configuration validation subroutine script. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. +# Copyright 1992-2013 Free Software Foundation, Inc. -timestamp='2004-11-30' +timestamp='2013-04-24' -# This file is (in principle) common to ALL GNU software. -# The presence of a machine in this file suggests that SOME GNU software -# can handle that machine. It does not imply ALL GNU software can. -# -# 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 -# the Free Software Foundation; either version 2 of the License, or +# 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 +# the Free Software Foundation; either version 3 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. +# 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. - +# along with this program; if not, see . +# # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. +# the same distribution terms that you use for the rest of that +# program. This Exception is an additional permission under section 7 +# of the GNU General Public License, version 3 ("GPLv3"). + -# Please send patches to . Submit a context -# diff and a properly formatted ChangeLog entry. +# Please send patches with a ChangeLog entry to config-patches@gnu.org. # # Configuration subroutine to validate and canonicalize a configuration type. # Supply the specified configuration type as an argument. # If it is invalid, we print an error message on stderr and exit with code 1. # Otherwise, we print the canonical config type on stdout and succeed. +# You can get the latest version of this script from: +# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD + # This file is supposed to be the same for all GNU packages # and recognize all the CPU types, system types and aliases # that are meaningful with *any* GNU software. @@ -70,8 +68,7 @@ version="\ GNU config.sub ($timestamp) -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 -Free Software Foundation, Inc. +Copyright 1992-2013 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -83,11 +80,11 @@ while test $# -gt 0 ; do case $1 in --time-stamp | --time* | -t ) - echo "$timestamp" ; exit 0 ;; + echo "$timestamp" ; exit ;; --version | -v ) - echo "$version" ; exit 0 ;; + echo "$version" ; exit ;; --help | --h* | -h ) - echo "$usage"; exit 0 ;; + echo "$usage"; exit ;; -- ) # Stop option processing shift; break ;; - ) # Use stdin as input. @@ -99,7 +96,7 @@ *local*) # First pass through any local machine types. echo $1 - exit 0;; + exit ;; * ) break ;; @@ -118,11 +115,18 @@ # 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* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \ - kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) + nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ + linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ + knetbsd*-gnu* | netbsd*-gnu* | \ + kopensolaris*-gnu* | \ + storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` ;; + android-linux) + os=-linux-android + basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown + ;; *) basic_machine=`echo $1 | sed 's/-[^-]*$//'` if [ $basic_machine != $1 ] @@ -145,10 +149,13 @@ -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ - -apple | -axis | -knuth | -cray) + -apple | -axis | -knuth | -cray | -microblaze*) os= basic_machine=$1 ;; + -bluegene*) + os=-cnk + ;; -sim | -cisco | -oki | -wec | -winbond) os= basic_machine=$1 @@ -163,13 +170,17 @@ os=-chorusos basic_machine=$1 ;; - -chorusrdb) - os=-chorusrdb + -chorusrdb) + os=-chorusrdb basic_machine=$1 - ;; + ;; -hiux*) os=-hiuxwe2 ;; + -sco6) + os=-sco5v6 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; -sco5) os=-sco3.2v5 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` @@ -186,6 +197,10 @@ # Don't forget version if it is 3.2v4 or newer. basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; + -sco5v6*) + # Don't forget version if it is 3.2v4 or newer. + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; -sco*) os=-sco3.2v2 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` @@ -203,6 +218,12 @@ -isc*) basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; + -lynx*178) + os=-lynxos178 + ;; + -lynx*5) + os=-lynxos5 + ;; -lynx*) os=-lynxos ;; @@ -227,57 +248,106 @@ # Some are omitted here because they have special meanings below. 1750a | 580 \ | a29k \ + | aarch64 | aarch64_be \ | 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 \ + | arc | arceb \ + | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ + | avr | avr32 \ + | be32 | be64 \ + | bfin \ | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ - | fr30 | frv \ + | epiphany \ + | fido | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ + | hexagon \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ - | m32r | m32rle | m68000 | m68k | m88k | mcore \ + | le32 | le64 \ + | lm32 \ + | m32c | m32r | m32rle | m68000 | m68k | m88k \ + | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ - | mips64vr | mips64vrel \ + | mips64octeon | mips64octeonel \ | mips64orion | mips64orionel \ + | mips64r5900 | mips64r5900el \ + | mips64vr | mips64vrel \ | mips64vr4100 | mips64vr4100el \ | mips64vr4300 | mips64vr4300el \ | mips64vr5000 | mips64vr5000el \ + | mips64vr5900 | mips64vr5900el \ | mipsisa32 | mipsisa32el \ | mipsisa32r2 | mipsisa32r2el \ | mipsisa64 | mipsisa64el \ | mipsisa64r2 | mipsisa64r2el \ | mipsisa64sb1 | mipsisa64sb1el \ | mipsisa64sr71k | mipsisa64sr71kel \ + | mipsr5900 | mipsr5900el \ | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ + | moxie \ + | mt \ | msp430 \ + | nds32 | nds32le | nds32be \ + | nios | nios2 | nios2eb | nios2el \ | ns16k | ns32k \ - | openrisc | or32 \ + | open8 \ + | or1k | or32 \ | pdp10 | pdp11 | pj | pjl \ - | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ + | powerpc | powerpc64 | powerpc64le | powerpcle \ | pyramid \ - | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ + | rl78 | rx \ + | score \ + | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ - | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \ - | strongarm \ - | tahoe | thumb | tic4x | tic80 | tron \ - | v850 | v850e \ + | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ + | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ + | spu \ + | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ + | ubicom32 \ + | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ | we32k \ - | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \ - | z8k) + | x86 | xc16x | xstormy16 | xtensa \ + | z8k | z80) basic_machine=$basic_machine-unknown ;; - m6811 | m68hc11 | m6812 | m68hc12) - # Motorola 68HC11/12. + c54x) + basic_machine=tic54x-unknown + ;; + c55x) + basic_machine=tic55x-unknown + ;; + c6x) + basic_machine=tic6x-unknown + ;; + m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) basic_machine=$basic_machine-unknown os=-none ;; m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) ;; + ms1) + basic_machine=mt-unknown + ;; + + strongarm | thumb | xscale) + basic_machine=arm-unknown + ;; + xgate) + basic_machine=$basic_machine-unknown + os=-none + ;; + xscaleeb) + basic_machine=armeb-unknown + ;; + + xscaleel) + basic_machine=armel-unknown + ;; # We use `pc' rather than `unknown' # because (1) that's what they normally are, and @@ -293,60 +363,82 @@ # Recognize the basic CPU types with company name. 580-* \ | a29k-* \ + | aarch64-* | aarch64_be-* \ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ - | avr-* \ - | bs2000-* \ - | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ + | avr-* | avr32-* \ + | be32-* | be64-* \ + | bfin-* | bs2000-* \ + | c[123]* | c30-* | [cjt]90-* | c4x-* \ | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ - | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \ + | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ + | hexagon-* \ | i*86-* | i860-* | i960-* | ia64-* \ | ip2k-* | iq2000-* \ - | m32r-* | m32rle-* \ + | le32-* | le64-* \ + | lm32-* \ + | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | mcore-* \ + | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ + | microblaze-* | microblazeel-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips16-* \ | mips64-* | mips64el-* \ - | mips64vr-* | mips64vrel-* \ + | mips64octeon-* | mips64octeonel-* \ | mips64orion-* | mips64orionel-* \ + | mips64r5900-* | mips64r5900el-* \ + | mips64vr-* | mips64vrel-* \ | mips64vr4100-* | mips64vr4100el-* \ | mips64vr4300-* | mips64vr4300el-* \ | mips64vr5000-* | mips64vr5000el-* \ + | mips64vr5900-* | mips64vr5900el-* \ | mipsisa32-* | mipsisa32el-* \ | mipsisa32r2-* | mipsisa32r2el-* \ | mipsisa64-* | mipsisa64el-* \ | mipsisa64r2-* | mipsisa64r2el-* \ | mipsisa64sb1-* | mipsisa64sb1el-* \ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ + | mipsr5900-* | mipsr5900el-* \ | mipstx39-* | mipstx39el-* \ | mmix-* \ + | mt-* \ | msp430-* \ + | nds32-* | nds32le-* | nds32be-* \ + | nios-* | nios2-* | nios2eb-* | nios2el-* \ | none-* | np1-* | ns16k-* | ns32k-* \ + | open8-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ - | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ + | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ | pyramid-* \ - | romp-* | rs6000-* \ - | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \ + | rl78-* | romp-* | rs6000-* | rx-* \ + | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ - | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \ - | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ - | tahoe-* | thumb-* \ + | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ + | sparclite-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ + | tahoe-* \ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ + | tile*-* \ | tron-* \ - | v850-* | v850e-* | vax-* \ + | ubicom32-* \ + | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ + | vax-* \ | we32k-* \ - | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \ - | xstormy16-* | xtensa-* \ + | x86-* | x86_64-* | xc16x-* | xps100-* \ + | xstormy16-* | xtensa*-* \ | ymp-* \ - | z8k-*) + | z8k-* | z80-*) + ;; + # Recognize the basic CPU types without company name, with glob match. + xtensa*) + basic_machine=$basic_machine-unknown ;; # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. @@ -364,7 +456,7 @@ basic_machine=a29k-amd os=-udi ;; - abacus) + abacus) basic_machine=abacus-unknown ;; adobe68k) @@ -410,6 +502,10 @@ basic_machine=m68k-apollo os=-bsd ;; + aros) + basic_machine=i386-pc + os=-aros + ;; aux) basic_machine=m68k-apple os=-aux @@ -418,10 +514,35 @@ basic_machine=ns32k-sequent os=-dynix ;; + blackfin) + basic_machine=bfin-unknown + os=-linux + ;; + blackfin-*) + basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; + bluegene*) + basic_machine=powerpc-ibm + os=-cnk + ;; + c54x-*) + basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + c55x-*) + basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + c6x-*) + basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; c90) basic_machine=c90-cray os=-unicos ;; + cegcc) + basic_machine=arm-unknown + os=-cegcc + ;; convex-c1) basic_machine=c1-convex os=-bsd @@ -450,8 +571,8 @@ basic_machine=craynv-cray os=-unicosmp ;; - cr16c) - basic_machine=cr16c-unknown + cr16 | cr16-*) + basic_machine=cr16-unknown os=-elf ;; crds | unos) @@ -489,6 +610,10 @@ basic_machine=m88k-motorola os=-sysv3 ;; + dicos) + basic_machine=i686-pc + os=-dicos + ;; djgpp) basic_machine=i586-pc os=-msdosdjgpp @@ -604,7 +729,6 @@ i370-ibm* | ibm*) basic_machine=i370-ibm ;; -# I'm not sure what "Sysv32" means. Should this be sysv3.2? i*86v32) basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` os=-sysv32 @@ -643,6 +767,14 @@ basic_machine=m68k-isi os=-sysv ;; + m68knommu) + basic_machine=m68k-unknown + os=-linux + ;; + m68knommu-*) + basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; m88k-omron*) basic_machine=m88k-omron ;; @@ -654,10 +786,21 @@ basic_machine=ns32k-utek os=-sysv ;; + microblaze*) + basic_machine=microblaze-xilinx + ;; + mingw64) + basic_machine=x86_64-pc + os=-mingw64 + ;; mingw32) basic_machine=i386-pc os=-mingw32 ;; + mingw32ce) + basic_machine=arm-unknown + os=-mingw32ce + ;; miniframe) basic_machine=m68000-convergent ;; @@ -683,10 +826,21 @@ basic_machine=i386-pc os=-msdos ;; + ms1-*) + basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` + ;; + msys) + basic_machine=i386-pc + os=-msys + ;; mvs) basic_machine=i370-ibm os=-mvs ;; + nacl) + basic_machine=le32-unknown + os=-nacl + ;; ncr3000) basic_machine=i486-ncr os=-sysv4 @@ -751,6 +905,12 @@ np1) basic_machine=np1-gould ;; + neo-tandem) + basic_machine=neo-tandem + ;; + nse-tandem) + basic_machine=nse-tandem + ;; nsr-tandem) basic_machine=nsr-tandem ;; @@ -758,9 +918,8 @@ basic_machine=hppa1.1-oki os=-proelf ;; - or32 | or32-*) + openrisc | openrisc-*) basic_machine=or32-unknown - os=-coff ;; os400) basic_machine=powerpc-ibm @@ -782,6 +941,14 @@ basic_machine=i860-intel os=-osf ;; + parisc) + basic_machine=hppa-unknown + os=-linux + ;; + parisc-*) + basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; pbd) basic_machine=sparc-tti ;; @@ -791,6 +958,12 @@ pc532 | pc532-*) basic_machine=ns32k-pc532 ;; + pc98) + basic_machine=i386-pc + ;; + pc98-*) + basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; pentium | p5 | k5 | k6 | nexgen | viac3) basic_machine=i586-pc ;; @@ -820,9 +993,10 @@ ;; power) basic_machine=power-ibm ;; - ppc) basic_machine=powerpc-unknown + ppc | ppcbe) basic_machine=powerpc-unknown ;; - ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` + ppc-* | ppcbe-*) + basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ppcle | powerpclittle | ppc-le | powerpc-little) basic_machine=powerpcle-unknown @@ -847,6 +1021,14 @@ basic_machine=i586-unknown os=-pw32 ;; + rdos | rdos64) + basic_machine=x86_64-pc + os=-rdos + ;; + rdos32) + basic_machine=i386-pc + os=-rdos + ;; rom68k) basic_machine=m68k-rom68k os=-coff @@ -873,6 +1055,10 @@ sb1el) basic_machine=mipsisa64sb1el-unknown ;; + sde) + basic_machine=mipsisa32-sde + os=-elf + ;; sei) basic_machine=mips-sei os=-seiux @@ -884,6 +1070,9 @@ basic_machine=sh-hitachi os=-hms ;; + sh5el) + basic_machine=sh5le-unknown + ;; sh64) basic_machine=sh64-unknown ;; @@ -905,6 +1094,9 @@ basic_machine=i860-stratus os=-sysv4 ;; + strongarm-* | thumb-*) + basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; sun2) basic_machine=m68000-sun ;; @@ -961,17 +1153,9 @@ 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 + tile*) + basic_machine=$basic_machine-unknown + os=-linux-gnu ;; tx39) basic_machine=mipstx39-unknown @@ -1040,6 +1224,9 @@ xps | xps100) basic_machine=xps100-honeywell ;; + xscale-* | xscalee[bl]-*) + basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'` + ;; ymp) basic_machine=ymp-cray os=-unicos @@ -1048,6 +1235,10 @@ basic_machine=z8k-unknown os=-sim ;; + z80-*-coff) + basic_machine=z80-unknown + os=-sim + ;; none) basic_machine=none-none os=-none @@ -1086,13 +1277,10 @@ we32k) basic_machine=we32k-att ;; - sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele) + sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele) basic_machine=sh-unknown ;; - sh64) - basic_machine=sh64-unknown - ;; - sparc | sparcv8 | sparcv9 | sparcv9b) + sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) basic_machine=sparc-sun ;; cydra) @@ -1136,9 +1324,12 @@ if [ x"$os" != x"" ] then case $os in - # First match some system type aliases - # that might get confused with valid system types. + # First match some system type aliases + # that might get confused with valid system types. # -solaris* is a basic system type, with this one exception. + -auroraux) + os=-auroraux + ;; -solaris1 | -solaris1.*) os=`echo $os | sed -e 's|solaris1|sunos4|'` ;; @@ -1159,26 +1350,31 @@ # Each alternative MUST END IN A *, to match a version number. # -sysv* is not here because it comes later, after sysvr4. -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ - | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\ - | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ + | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ + | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ + | -sym* | -kopensolaris* | -plan9* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ - | -aos* \ + | -aos* | -aros* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ - | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \ + | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ + | -bitrig* | -openbsd* | -solidbsd* \ | -ekkobsd* | -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* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \ + | -chorusos* | -chorusrdb* | -cegcc* \ + | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ + | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ + | -linux-newlib* | -linux-musl* | -linux-uclibc* \ + | -uxpv* | -beos* | -mpeix* | -udk* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ - | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*) + | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ + | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1196,7 +1392,7 @@ os=`echo $os | sed -e 's|nto|nto-qnx|'` ;; -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ - | -windows* | -osx | -abug | -netware* | -os9* | -beos* \ + | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \ | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) ;; -mac*) @@ -1217,7 +1413,7 @@ -opened*) os=-openedition ;; - -os400*) + -os400*) os=-os400 ;; -wince*) @@ -1266,7 +1462,7 @@ -sinix*) os=-sysv4 ;; - -tpf*) + -tpf*) os=-tpf ;; -triton*) @@ -1302,12 +1498,14 @@ -aros*) os=-aros ;; - -kaos*) - os=-kaos - ;; -zvmoe) os=-zvmoe ;; + -dicos*) + os=-dicos + ;; + -nacl*) + ;; -none) ;; *) @@ -1330,6 +1528,12 @@ # system, and we'll never get to this point. case $basic_machine in + score-*) + os=-elf + ;; + spu-*) + os=-elf + ;; *-acorn) os=-riscix1.2 ;; @@ -1339,9 +1543,21 @@ arm*-semi) os=-aout ;; - c4x-* | tic4x-*) - os=-coff - ;; + c4x-* | tic4x-*) + os=-coff + ;; + hexagon-*) + os=-elf + ;; + tic54x-*) + os=-coff + ;; + tic55x-*) + os=-coff + ;; + tic6x-*) + os=-coff + ;; # This must come before the *-dec entry. pdp10-*) os=-tops20 @@ -1360,19 +1576,22 @@ ;; m68000-sun) os=-sunos3 - # This also exists in the configure program, but was not the - # default. - # os=-sunos4 ;; m68*-cisco) os=-aout ;; + mep-*) + os=-elf + ;; mips*-cisco) os=-elf ;; mips*-*) os=-elf ;; + or1k-*) + os=-elf + ;; or32-*) os=-coff ;; @@ -1385,10 +1604,13 @@ *-be) os=-beos ;; + *-haiku) + os=-haiku + ;; *-ibm) os=-aix ;; - *-knuth) + *-knuth) os=-mmixware ;; *-wec) @@ -1493,7 +1715,7 @@ -sunos*) vendor=sun ;; - -aix*) + -cnk*|-aix*) vendor=ibm ;; -beos*) @@ -1556,7 +1778,7 @@ esac echo $basic_machine$os -exit 0 +exit # Local variables: # eval: (add-hook 'write-file-hooks 'time-stamp) --- tvtime-1.0.2.orig/debian/README.Debian +++ tvtime-1.0.2/debian/README.Debian @@ -0,0 +1,15 @@ +tvtime +====== + +This is the official Debian package for tvtime. + + tvtime's source package is rather large, since it incorporates the +Free UCS Outline Fonts [1], and also the DScaler [2] filters. The +Debian package does not install the Free UCS Outline Fonts, but rather +depends on the ttf-freefont package. As such, the debian/rules script +uses the FREEFONT_CFLAGS variable in src/Makefile.am to convince +tvtime to look in the right place. + +[1] http://savannah.nongnu.org/projects/freefont/ + + -- Simon Law Wed, 07 Sep 2005 22:20:15 -0400 --- tvtime-1.0.2.orig/debian/README.source +++ tvtime-1.0.2/debian/README.source @@ -0,0 +1,2 @@ +This package uses the patch system "quilt". +See /usr/share/doc/quilt/README.source for details. --- tvtime-1.0.2.orig/debian/changelog +++ tvtime-1.0.2/debian/changelog @@ -0,0 +1,917 @@ +tvtime (1.0.2-14ubuntu3) vivid; urgency=medium + + * Improve error message about invalid framesize: + - The "Frame too short" error message is not quite right. The problem is + that tvtime expects exactly the same height as available on a TV standard, + e.g. 480 or 576. Any different value (even bigger) won't work. + - Renamed tvtime-1.0.2-videoinput.patch to tvtime-1.0.2-uvc.patch + + -- POJAR GEORGE Thu, 12 Mar 2015 17:37:24 +0000 + +tvtime (1.0.2-14ubuntu2) vivid; urgency=medium + + * Updated debian/patches/tvtime-1.0.2-alsamixer.patch: + - Fix default ALSA mixer. The master volume at the default mixer is called + "Master", and not "Line". This is the volume that applies to all devices. + Ok, old PCI devices may have a cable wired into the "Line" input at the + motherboard but this is not a common setup anymore. (LP: #991134) + - Fix error message when channel is not available. + - Updated man pages in agreement with these changes. + * Updated debian/patches/tvtime-1.0.2-build.patch: + - Set subdir-objects automake option. This will be enabled by default in + automake 2.0 so better be prepared. + * debian/control: Updated to Standards-Version 3.9.6, no changes needed. + + -- POJAR GEORGE Thu, 05 Mar 2015 12:05:03 +0000 + +tvtime (1.0.2-14ubuntu1) vivid; urgency=medium + + * Merge with Debian; remaining changes: + - debian/patches/tvtime-1.0.1-savematte.patch + - debian/patches/desktop_file.patch + - debian/patches/tvtime-1.0.2-alsa.patch + - debian/patches/tvtime-1.0.2-alsamixer.patch + - debian/patches/pal_audio_mode_persistence.patch + - debian/patches/tvtime-1.0.2-screensaver.patch + - debian/patches/tvtime-1.0.2-videoinput.patch + - debian/patches/tvtime-1.0.2-osd.patch + - debian/patches/tvtime-1.0.2-usage.patch + - debian/patches/tvtime-1.0.2-command.patch + - debian/patches/tvtime-1.0.2-cursor.patch + - debian/patches/tvtime-1.0.2-metacity.patch + - debian/patches/tvtime-1.0.2-x_size_hint.patch + - debian/patches/tvtime-1.0.2-menu.patch + - debian/patches/tvtime-1.0.2-focus_mouse.patch + - debian/patches/tvtime-1.0.2-wmicon.patch + - debian/patches/tvtime-1.0.2-tvtimeosd.patch + - debian/patches/tvtime-1.0.2-cpuid.patch + - debian/patches/tvtime-1.0.2-xmltv.patch + - debian/patches/tvtime-1.0.2-vbidata.patch + - debian/patches/tvtime-1.0.2-verbose.patch + - debian/patches/tvtime-1.0.2-vbiscreen.patch + - debian/patches/tvtime-1.0.2-closed_caption.patch + - debian/patches/tvtime-1.0.2-vbi.patch + - debian/patches/tvtime-1.0.2-xinerama.patch + - debian/patches/tvtime-1.0.2-volume.patch + - debian/patches/tvtime-1.0.2-xcommon.patch + - debian/patches/tvtime-1.0.2-station_remap.patch + - debian/patches/tvtime-1.0.2-channel_list.patch + - debian/patches/tvtime-1.0.2_cppcheck.patch + - debian/patches/tvtime-1.0.2-build.patch + - debian/patches/tvtime-1.0.2-wmpid.patch + - debian/patches/tvtime-1.0.2-libsupc++.patch + - debian/control: Build-Depends on autoconf, automake, autopoint, libtool + libasound2-dev and libxss instead of libxtst. + - debian/rules: Call autoreconf to regenerate the configure script. + - debian/source/format: Added file. + + -- Matthias Klose Wed, 04 Mar 2015 11:36:28 +0100 + +tvtime (1.0.2-14) unstable; urgency=medium + + * QA upload. + * Fix "depend on perl instead of perl-modules": + debian/control: update Depends. + (Closes: #779121) + + -- gregor herrmann Wed, 25 Feb 2015 20:54:12 +0100 + +tvtime (1.0.2-13ubuntu1) vivid; urgency=medium + + * Merge with Debian unstable, remaining Ubuntu changes: + - debian/patches/tvtime-1.0.1-savematte.patch + - debian/patches/desktop_file.patch + - debian/patches/tvtime-1.0.2-alsa.patch + - debian/patches/tvtime-1.0.2-alsamixer.patch + - debian/patches/pal_audio_mode_persistence.patch + - debian/patches/tvtime-1.0.2-screensaver.patch + - debian/patches/tvtime-1.0.2-videoinput.patch + - debian/patches/tvtime-1.0.2-osd.patch + - debian/patches/tvtime-1.0.2-usage.patch + - debian/patches/tvtime-1.0.2-command.patch + - debian/patches/tvtime-1.0.2-cursor.patch + - debian/patches/tvtime-1.0.2-metacity.patch + - debian/patches/tvtime-1.0.2-x_size_hint.patch + - debian/patches/tvtime-1.0.2-menu.patch + - debian/patches/tvtime-1.0.2-focus_mouse.patch + - debian/patches/tvtime-1.0.2-wmicon.patch + - debian/patches/tvtime-1.0.2-tvtimeosd.patch + - debian/patches/tvtime-1.0.2-cpuid.patch + - debian/patches/tvtime-1.0.2-xmltv.patch + - debian/patches/tvtime-1.0.2-vbidata.patch + - debian/patches/tvtime-1.0.2-verbose.patch + - debian/patches/tvtime-1.0.2-vbiscreen.patch + - debian/patches/tvtime-1.0.2-closed_caption.patch + - debian/patches/tvtime-1.0.2-vbi.patch + - debian/patches/tvtime-1.0.2-xinerama.patch + - debian/patches/tvtime-1.0.2-volume.patch + - debian/patches/tvtime-1.0.2-xcommon.patch + - debian/patches/tvtime-1.0.2-station_remap.patch + - debian/patches/tvtime-1.0.2-channel_list.patch + - debian/patches/tvtime-1.0.2_cppcheck.patch + - debian/patches/tvtime-1.0.2-build.patch + - debian/patches/tvtime-1.0.2-wmpid.patch + - debian/patches/tvtime-1.0.2-libsupc++.patch + - debian/control: Build-Depends on autoconf, automake, autopoint, libtool + libasound2-dev and libxss instead of libxtst. + - debian/rules: Call autoreconf to regenerate the configure script. + - debian/source/format: Added file. + Dropped Debian changes: + - debian/control: Suggests: oss-compat. + - debian/control: Build-Depends chrpath. + - debian/rules: Fixed binary-or-shlib-defines-rpath. + + -- POJAR GEORGE Thu, 20 Nov 2014 11:26:03 +0000 + +tvtime (1.0.2-13) unstable; urgency=low + + * QA upload. + * Switch ttf-freefont to fonts-freefont-ttf in Depends. Closes: #738253 + * Assume that dpkg-statoverride exists and stop using absolute paths when + calling it in maintainer scripts. + + -- Guillem Jover Mon, 17 Nov 2014 13:58:00 +0100 + +tvtime (1.0.2-12.1ubuntu3) utopic; urgency=medium + + * Fix a bug where the alsa thread never stops. + - If the output audio device never read the buffer then the alsa thread + would continue to fill it up and never stop when the capture stops. + * debian/control: Depend on fonts-freefont-ttf instead of ttf-freefont as the + package got renamed. + + -- POJAR GEORGE Mon, 11 Aug 2014 11:22:20 +0000 + +tvtime (1.0.2-12.1ubuntu2) utopic; urgency=medium + + * Added an explicit reference to the audio settings in man and help pages in + the event that capture card is not connected to the sound card via a cable. + + -- POJAR GEORGE Tue, 10 Jun 2014 16:44:22 +0000 + +tvtime (1.0.2-12.1ubuntu1) utopic; urgency=medium + + * Merge with Debian unstable (LP: #1215656, #1215678, #1264960), remaining + Ubuntu changes: + - debian/patches/tvtime-1.0.1-savematte.patch + - debian/patches/desktop_file.patch + - debian/patches/tvtime-1.0.2-alsa.patch + - debian/patches/tvtime-1.0.2-alsamixer.patch + - debian/patches/pal_audio_mode_persistence.patch + - debian/patches/tvtime-1.0.2-screensaver.patch + - debian/patches/tvtime-1.0.2-videoinput.patch + - debian/patches/tvtime-1.0.2-osd.patch + - debian/patches/tvtime-1.0.2-usage.patch + - debian/patches/tvtime-1.0.2-command.patch + - debian/patches/tvtime-1.0.2-cursor.patch + - debian/patches/tvtime-1.0.2-metacity.patch + - debian/patches/tvtime-1.0.2-x_size_hint.patch + - debian/patches/tvtime-1.0.2-menu.patch + - debian/patches/tvtime-1.0.2-focus_mouse.patch + - debian/patches/tvtime-1.0.2-wmicon.patch + - debian/patches/tvtime-1.0.2-tvtimeosd.patch + - debian/patches/tvtime-1.0.2-cpuid.patch + - debian/patches/tvtime-1.0.2-xmltv.patch + - debian/patches/tvtime-1.0.2-vbidata.patch + - debian/patches/tvtime-1.0.2-verbose.patch + - debian/patches/tvtime-1.0.2-vbiscreen.patch + - debian/patches/tvtime-1.0.2-closed_caption.patch + - debian/patches/tvtime-1.0.2-vbi.patch + - debian/patches/tvtime-1.0.2-xinerama.patch + - debian/patches/tvtime-1.0.2-volume.patch + - debian/patches/tvtime-1.0.2-xcommon.patch + - debian/patches/tvtime-1.0.2-station_remap.patch + - debian/patches/tvtime-1.0.2-channel_list.patch + - debian/patches/tvtime-1.0.2_cppcheck.patch + - debian/patches/tvtime-1.0.2-build.patch + - debian/patches/tvtime-1.0.2-wmpid.patch + - debian/patches/tvtime-1.0.2-libsupc++.patch + - debian/control: Build-Depends on autoconf, automake, autopoint, libtool + libasound2-dev and libxss instead of libxtst. + - debian/rules: Call autoreconf to regenerate the configure script. + - debian/source/format: Added file. + Dropped Debian changes: + - debian/control: Suggests: oss-compat. + - debian/control: Build-Depends chrpath. + - debian/rules: Fixed binary-or-shlib-defines-rpath. + * debian/patches/tvtime-1.0.2-device.patch: Add feature to auto detect video + and vbi devices. (LP: #153801) + * debian/patches/tvtime-1.0.2-videodev.patch: Get rid of private versions of + videodev.h and videodev2.h + * Updated debian/patches/tvtime-1.0.2-alsa.patch: Improved alsa audio + streaming code. (LP: #472770, #963036) + * Removed debian/patches/tvtime-1.0.2-output_volume.patch + * debian/rules: Make autoreconf not call autopoint since we ship a patch for + po/Makefile.in.in + * debian/control: Build-Depends on libv4l-dev. + + -- POJAR GEORGE Mon, 28 Apr 2014 06:07:20 +0000 + +tvtime (1.0.2-12.1) unstable; urgency=medium + + * Non-maintainer upload. + * Update home.diff patch. (Closes: #732207) + + -- Maximiliano Curia Fri, 25 Apr 2014 18:08:48 +0200 + +tvtime (1.0.2-12) unstable; urgency=low + + * QA upload, orphaning this package, see #728576. + + -- Bart Martens Sun, 15 Dec 2013 12:02:03 +0100 + +tvtime (1.0.2-11) unstable; urgency=low + + * Moved default.tvtime.xml from usr/share/doc/tvtime/examples to + usr/share/tvtime. Closes: #709955. + * debian/patches/home.diff: Added. Closes: #716410, #716409, #720587. + + -- Bart Martens Sat, 14 Dec 2013 17:58:43 +0100 + +tvtime (1.0.2-10ubuntu10) trusty; urgency=medium + + * debian/patches/tvtime-1.0.2-wmpid.patch: Add support to the _NET_WM_PID + atom. (LP: #1265577) + * debian/patches/tvtime-1.0.2-libsupc++.patch: Link to libsupc++ instead of + bringing in libstdc++. (LP: #1265576) + * Updated debian/patches/tvtime-1.0.2-cppcheck.patch: Fixed more memory leak. + * Renamed debian/patches/tvtime-1.0.2-icon.patch to tvtime-1.0.2-wmicon.patch + * debian/control: Updated to Standards-Version 3.9.5, no changes needed. + + -- POJAR GEORGE Thu, 02 Jan 2014 17:01:25 +0000 + +tvtime (1.0.2-10ubuntu9) saucy; urgency=low + + * Update libtool at build time using autoreconf -fi, in order to fix a build + failure. (LP: #1216386) + * Updated debian/patches/tvtime-1.0.2-build.patch: + - Run autoupdate to modernize configure.ac. + - Remove AC_TYPE_SIGNAL usage. + - Concatenate with tvtime-1.0.2-build.patch and tvtime-1.0.2-libtool.patch + and remove them as result. + * Removed the content against config.h.in, configure and Makefile.in from + desktop_file.patch and tvtime-1.0.2-screensaver.patch, since we use + autoreconf anyways. + * Updated debian/patches/tvtime-1.0.2-cppcheck.patch: Reject symbolic links + on platforms that support O_NOFOLLOW when open a file (security feature). + * Updated tvtime-1.0.2-xmltv.patch: Fixed variable length array folded to + constant array as an extension. + * debian/control: Build-Depends on autopoint. + + -- POJAR GEORGE Sun, 25 Aug 2013 13:07:19 +0000 + +tvtime (1.0.2-10ubuntu8) saucy; urgency=low + + * Updated debian/patches/tvtime-1.0.2-cppcheck.patch: Return 0 if config file + name will be to long. + + -- POJAR GEORGE Sat, 15 Jun 2013 19:04:14 +0000 + +tvtime (1.0.2-10ubuntu7) saucy; urgency=low + + * debian/patches/tvtime-1.0.2-cppcheck.patch: Fix severe errors in the code + discovered with the cppcheck static code analysis tool. (LP: #1191093) + - (error) Possible null pointer dereference: x - otherwise it is redundant + to check it against null. + - (error) Common realloc mistake: x nulled but not freed upon failure. + - (error) Resource leak: x. + - (error) Buffer is accessed out of bounds: x. + - (error) Memory leak: x. + - (error) Dangerous usage of x (strncpy doesn't always null-terminate it). + - (warning) Dangerous usage of strncat - x'rd parameter is the maximum + number of characters to append. + - (warning) The buffer x may not be null-terminated after the call to + strncpy(). + + -- POJAR GEORGE Fri, 14 Jun 2013 18:18:36 +0000 + +tvtime (1.0.2-10ubuntu6) saucy; urgency=low + + * Modified debian/patches/tvtime-1.0.2-channel_list.patch: Prevent app to + crash when try to renumber current channel by send an 'ENTER' command if we + type more digits than there are channels. (LP: #1164457) + - Deleted tvtime-1.0.2-key_event.patch as a result. + + -- POJAR GEORGE Thu, 04 Apr 2013 09:32:25 +0000 + +tvtime (1.0.2-10ubuntu5) raring; urgency=low + + * Updated debian/patches/tvtime-1.0.2-channel_list.patch: Make more logical + behavior when channel selection menu is active: move to channel in menu + instead to switch channel. (LP: #1163770) + + -- POJAR GEORGE Tue, 02 Apr 2013 13:53:01 +0000 + +tvtime (1.0.2-10ubuntu4) raring; urgency=low + + * debian/patches/tvtime-1.0.2-channel_list.patch: Added a "CHANNEL_LIST" + command to shows a channel selection menu. (LP: #1094987) + * Updated debian/patches/tvtime-1.0.2-xmltv.patch: Don't show EPG info when + videoinput != tuner. (LP: #1158277) + + -- POJAR GEORGE Sun, 03 Mar 2013 17:40:06 +0000 + +tvtime (1.0.2-10ubuntu3) raring; urgency=low + + * debian/patches/tvtime-1.0.2-station_remap.patch: Corrected a small bug, + where after remapping a station to a different number, the number of + stations (mgr->num_stations) was not updated accordingly. (LP: #1099042) + * debian/control: Updated to Standards-Version 3.9.4, no changes needed. + + -- POJAR GEORGE Sun, 13 Jan 2013 05:09:16 +0000 + +tvtime (1.0.2-10ubuntu2) raring; urgency=low + + * Updated tvtime-1.0.2-key_event.patch: Fixed command + "tvtime-command CHANNEL_RENUMBER". (LP: #1074512) + + -- POJAR GEORGE Fri, 14 Dec 2012 13:12:45 +0000 + +tvtime (1.0.2-10ubuntu1) raring; urgency=low + + * Merge from Debian unstable (LP: #92752). Remaining Ubuntu changes: + - Retain patches: + tvtime-1.0.1-savematte.patch, desktop_file.patch, tvtime-1.0.2-alsa.patch, + tvtime-1.0.2-alsamixer.patch, pal_audio_mode_persistence.patch, + tvtime-1.0.2-screensaver.patch, tvtime-1.0.2-videoinput.patch, + tvtime-1.0.2-osd.patch, tvtime-1.0.2-usage.patch, + tvtime-1.0.2-command.patch, tvtime-1.0.2-build.patch, + tvtime-1.0.2-libtool.patch, tvtime-1.0.2-cursor.patch, + tvtime-1.0.2-metacity.patch, tvtime-1.0.2-x_size_hint.patch, + tvtime-1.0.2-menu.patch, tvtime-1.0.2-focus_mouse.patch, + tvtime-1.0.2-icon.patch, tvtime-1.0.2-tvtimeosd.patch, + tvtime-1.0.2-cpuid.patch, tvtime-1.0.2-xmltv.patch, + tvtime-1.0.2-vbidata.patch, tvtime-1.0.2-verbose.patch, + tvtime-1.0.2-vbiscreen.patch, tvtime-1.0.2-closed_caption.patch, + tvtime-1.0.2-key_event.patch, tvtime-1.0.2-vbi.patch, + tvtime-1.0.2-xinerama.patch, tvtime-1.0.2-volume.patch, + tvtime-1.0.2-output_volume.patch, tvtime-1.0.2-autoconf.patch, + tvtime-1.0.2-xcommon.patch. + - debian/control: Build-Depends on autoconf, automake, libasound2-dev, + libtool and libxss instead of libxtst. + - debian/rules: Call autoreconf to re-generate the configure script. + - added debian/source/format file. + * Droped Debian changes: + - debian/control: Suggests: oss-compat. + - debian/control: Build-Depends chrpath. + - debian/rules: Fixed binary-or-shlib-defines-rpath. + + -- POJAR GEORGE Sun, 09 Dec 2012 18:02:59 +0000 + +tvtime (1.0.2-10) unstable; urgency=low + + * debian/patches/saveconfig.diff: Added. Prevents needless creation of + $HOME/.tvtime by tvtime-configure. Closes: #694892, #445192. + + -- Bart Martens Fri, 07 Dec 2012 08:44:21 +0000 + +tvtime (1.0.2-9ubuntu1) quantal; urgency=low + + * Merge from Debian unstable (LP: #996363). Remaining Ubuntu changes: + - Retain patches: + tvtime-1.0.1-savematte.patch, desktop_file.patch, tvtime-1.0.2-alsa.patch, + tvtime-1.0.2-alsamixer.patch, pal_audio_mode_persistence.patch, + tvtime-1.0.2-screensaver.patch, tvtime-1.0.2-videoinput.patch, + tvtime-1.0.2-osd.patch, tvtime-1.0.2-usage.patch, + tvtime-1.0.2-command.patch, tvtime-1.0.2-build.patch, + tvtime-1.0.2-libtool.patch, tvtime-1.0.2-cursor.patch, + tvtime-1.0.2-metacity.patch, tvtime-1.0.2-x_size_hint.patch, + tvtime-1.0.2-menu.patch, tvtime-1.0.2-focus_mouse.patch, + tvtime-1.0.2-icon.patch, tvtime-1.0.2-tvtimeosd.patch, + tvtime-1.0.2-cpuid.patch, tvtime-1.0.2-xmltv.patch, + tvtime-1.0.2-vbidata.patch, tvtime-1.0.2-verbose.patch, + tvtime-1.0.2-vbiscreen.patch, tvtime-1.0.2-closed_caption.patch, + tvtime-1.0.2-key_event.patch, tvtime-1.0.2-vbi.patch, + tvtime-1.0.2-xinerama.patch, tvtime-1.0.2-volume.patch, + tvtime-1.0.2-output_volume.patch. + - debian/control: Build-Depends on autoconf, automake, libasound2-dev, + libtool and libxss instead of libxtst. + - debian/rules: Call autoreconf to re-generate the configure script. + * Droped Ubuntu changes: + - tvtime-1.0.2-from-upstream-fullscreen-crash.patch, applied in Debian as + fullscreen.diff + - tvtime-1.0.2-libpng-1.5.patch, applied in Debian as libpng.diff + - tvtime-1.0.2-xvoutput.patch, applied in Debian as typo.diff + * Droped Debian changes: + - debian/control: Suggests: oss-compat. + - debian/control: Build-Depends chrpath. + - debian/rules: Fixed binary-or-shlib-defines-rpath. + * debian/patches/tvtime-1.0.2-autoconf.patch: Fix warns about files that seem + to use datarootdir without defining it. + * debian/patches/tvtime-1.0.2-xcommon.patch: Replace deprecated function + XKeycodeToKeysym() with XkbKeycodeToKeysym(). + * Update the "Comment" and "Name" field value in debian/desktop_file.patch + * Added debian/source/format file. + + -- POJAR GEORGE Sat, 02 Jun 2012 17:16:42 -0400 + +tvtime (1.0.2-9) unstable; urgency=low + + * debian/patches/libpng.diff: Added. Closes: #650582. + * debian/control: Suggests: oss-compat. Closes: #506726. + + -- Bart Martens Thu, 24 May 2012 05:09:15 +0000 + +tvtime (1.0.2-8) unstable; urgency=low + + * debian/control: Build-Depends: quilt, chrpath. + * debian/rules: Modified to use quilt patches. + * debian/patches/fullscreen.diff: Closes: #568318. + * debian/rules: Fixed debian-rules-missing-recommended-target. + * debian/rules: Fixed binary-or-shlib-defines-rpath. + * debian/patches/typo.diff: Closes: #671612. + * debian/po/nl.po: Closes: #657467. + * debian/po/pl.po: Closes: #666444. + * debian/po/tr.po: Closes: #667485. + * debian/templates, debian/po/.po: Replaced -19 by -20. Closes: #539669. + * debian/README.source: Added. Fixes patch-system-but-no-source-readme. + * debian/source.lintian-overrides: Added to override + patch-system-but-direct-changes-in-diff. + + -- Bart Martens Sun, 06 May 2012 08:19:42 +0000 + +tvtime (1.0.2-7ubuntu9) precise; urgency=low + + * debian/patches/tvtime-1.0.2-volume.patch: Leave volume muted when decreasing + volume, this way if the volume is accidentally way too loud, you can mute + and decrease without it coming back on. (LP: #962666) + * debian/patches/tvtime-1.0.2-output_volume.patch: Add option to show output + volume percentage on startup. + * Update debian/patches/pal_audio_mode_persistence.patch to declare omitted + function + added header to patch. + + -- POJAR GEORGE Thu, 22 Mar 2012 16:21:31 +0000 + +tvtime (1.0.2-7ubuntu8) precise; urgency=low + + * debian/patches/tvtime-1.0.2-vbi.patch: Add support for more generic VBI + handling. Currently only tested with the HVR-950 (em28xx based), so there + may need to be additional changes required for other boards) (LP: #961677) + * debian/patches/tvtime-1.0.2-xinerama.patch: Make it possible to disable + xinerama manually. + * Update tvtime-1.0.2-alsa.patch (The xfer_align and sleep_min is the obsolete + feature now. Remove it from audiolib.c to avoid deprecated calls) + * debian/rules: Lintian reports 2 warnings about this package (build-arch and + build-indep should be provided). OK + + -- POJAR GEORGE Wed, 21 Mar 2012 21:24:33 +0000 + +tvtime (1.0.2-7ubuntu7) precise; urgency=low + + * Update desktop_file.patch to resolve launcher icon description, rename + net-tvtime.desktop to tvtime.desktop (LP: #959408) + + -- POJAR GEORGE Mon, 19 Mar 2012 16:44:12 +0000 + +tvtime (1.0.2-7ubuntu6) precise; urgency=low + + * debian/patches/tvtime-1.0.2-usage.patch: Fix documentation for MENU_ENTER + and MENU_BACK, remove all historic "added in tvtime 0.9.x" notes from + usage.html (LP: #372822) + * debian/patches/tvtime-1.0.2-xvoutput.patch: Fix typo in url in an error + message. (LP: #947845) + * debian/patches/tvtime-1.0.2-command.patch: Fix crash on + "tvtime-command set_input_width 720" (LP: #947850) + * debian/patches/tvtime-1.0.2-build.patch: Fix two warnings when autoreconf + is called + * debian/patches/tvtime-1.0.2-libtool.patch: Fix a few issues requested by + libtool stuff + * debian/patches/tvtime-1.0.2-cursor.patch: Fix nocursor using uninitialized + pixmap data + * debian/patches/tvtime-1.0.2-metacity.patch: Remove check for metacity, the + result isn't used anyway and the problem probably doesn't exist anymore + either + * debian/patches/tvtime-1.0.2-x_size_hint.patch: Remember our XSizeHints + structure so we don't destroy all our hints next time we try to update it + * debian/patches/tvtime-1.0.2-menu.patch: Change default right mouse button + bind to leave menu when in menu + * debian/patches/tvtime-1.0.2-focus_mouse.patch: Don't force focus follows + mouse mode for our window, that's up to the window manager to decide + * debian/patches/tvtime-1.0.2-icon.patch: Fix setting the _NET_WM_ICON hint + on 64-bit systems. When Xlib says '32' it actually means 'unsigned long'. + Even if that is actually 64 bits + * debian/patches/tvtime-1.0.2-tvtimeosd.patch: Fix a warning about printf + format not being a string literal + * debian/patches/tvtime-1.0.2-cpuid.patch: Update for cpuaccel.c from + http://stapelspeicher.org/tvtime/patches/ (originally from libmpeg2) + * debian/patches/tvtime-1.0.2-libpng-1.5.patch: Include zlib.h explicitly as + it isn't done for us in libpng-1.5 + * debian/patches/tvtime-1.0.2-xmltv.patch: Implementing more xmltv features, + show TV Guide program from XMLTV listings with "tvtime-command SHOW_EPG", + see documentation + * debian/patches/tvtime-1.0.2-vbidata.patch: Remove a debugging printf that + snuck out + * debian/patches/tvtime-1.0.2-verbose.patch: Print a helpful error message if + tvtime was miscompiled without X support + * debian/patches/tvtime-1.0.2-vbiscreen.patch: Import patch from tvtime + sourceforge tracker related to CC multiline clearing + * debian/patches/tvtime-1.0.2-closed_caption.patch: Import patch from tvtime + sourceforge tracker related to CC double-byte chars + * debian/patches/tvtime-1.0.2-key_event.patch: Fix command + "tvtime-command KEY_EVENT ENTER" in menu (LP: #951473) + * debian/control: update to starndards-version 3.9.3, no changes needed + + -- POJAR GEORGE Mon, 19 Mar 2012 08:10:07 +0100 + +tvtime (1.0.2-7ubuntu5) precise; urgency=low + + * debian/patches/tvtime-1.0.2-videoinput.patch: + tvtime does not work with UVC webcams (LP: #383669) + * debian/patches/tvtime-1.0.2-osd.patch: + Increase osd fadeout time and make it a less sickly color (LP: #940194) + + -- POJAR GEORGE Fri, 24 Feb 2012 10:09:57 +0000 + +tvtime (1.0.2-7ubuntu4) precise; urgency=low + + * debian/patches/tvtime-1.0.2-screensaver.patch: + Use XScreenSaverExtension instead of typing text via Xtest (LP: #715242) + * debian/control: Build-depend on libxss instead of libxtst. + + -- POJAR GEORGE Sat, 11 Feb 2012 17:16:41 +0000 + +tvtime (1.0.2-7ubuntu3) precise; urgency=low + + * debian/patches/tvtime-1.0.2-from-upstream-fullscreen-crash.patch: + Fix crash when toggling fullscreen (LP: #151479) + + -- POJAR GEORGE Tue, 31 Jan 2012 13:28:10 +0000 + +tvtime (1.0.2-7ubuntu2) precise; urgency=low + + * Update tvtime-1.0.2-alsa.patch to resolve crashes when the default + video device is inappropriate. Patch from Markus Rechberger, + thanks! (LP: #575938, #552060) + - Delete tvtime-1.0.2-videoinput_get_audio-check-vidin.patch as a + result. + - Rediff tvtime-1.0.2-alsamixer.patch, pal_audio_mode_persistence.patch. + + -- Daniel T Chen Sat, 05 Nov 2011 10:44:44 -0400 + +tvtime (1.0.2-7ubuntu1) oneiric; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Retain patches (tvtime-1.0.2-videoinput_get_audio-check-vidin.patch, + tvtime-1.0.2-alsamixer.patch, tvtime-1.0.1-savematte.patch, + desktop_file.patch, tvtime-1.0.2-alsa.patch) + - debian/control: additional build-dependencies + - debian/rules: call autoreconf + * Apply pal_audio_mode_persistence.patch from John Lee . + Thanks, John! (LP: #540268) + + -- Daniel T Chen Sun, 14 Aug 2011 15:12:13 -0400 + +tvtime (1.0.2-7) unstable; urgency=low + + * src/Makefile.in: Added "-lm" three times. Closes: #556510. + * Ack NMU 1.0.2-6.1. + + -- Bart Martens Sat, 14 May 2011 18:11:31 +0000 + +tvtime (1.0.2-6.1ubuntu3) oneiric; urgency=low + + * debian/patches/tvtime-1.0.2-videoinput_get_audio-check-vidin.patch: + Guard against vidin being NULL, which was causing a crash. Patch + from Markus Rechberger, thanks! (LP: #509314, #630793) + + -- Daniel T Chen Wed, 29 Jun 2011 02:03:59 -0600 + +tvtime (1.0.2-6.1ubuntu2) natty; urgency=low + + * debian/patches/tvtime-1.0.2-alsamixer.patch: Apply patch for alsamixer + support, from Fedora (LP: #680386) + + -- David Henningsson Mon, 22 Nov 2010 16:28:51 +0100 + +tvtime (1.0.2-6.1ubuntu1) maverick; urgency=low + + * Merge from Debian unstable, remaining changes: + - Add quilt support. + - debian/patches/tvtime-1.0.1-savematte.patch: tvtime does not rebember + matte settings (LP: #313570). + - debian/patches/desktop_file.patch: Fix docs/net-tvtime.desktop as + Freedesktop.org's per-spec. + - Add tvtime-1.0.2-alsa.patch to enable audio routing from external TV card; + - debian/control: Build-depend on autoconf, automake, libasound2-dev, + libtool. + - debian/rules: Call autoreconf to re-generate the configure script. + + -- Lorenzo De Liso Sat, 28 Aug 2010 23:29:17 +0200 + +tvtime (1.0.2-6.1) unstable; urgency=low + + * Non-maintainer upload. + * Fix pending l10n issues. Debconf translations: + - Spanish (Francisco Javier Cuadrado). Closes: #579511 + - Danish (Joe Hansen). Closes: #589856 + - Czech (Jan Outrata). Closes: #589955 + + -- Christian Perrier Sun, 25 Jul 2010 14:43:39 +0200 + +tvtime (1.0.2-6ubuntu1) maverick; urgency=low + + * Merge from debian unstable (LP: #604976), remaining changes: + - Add quilt support. + - debian/patches/tvtime-1.0.1-savematte.patch: tvtime does not rebember + matte settings (LP: #313570). + - debian/patches/desktop_file.patch: Fix docs/net-tvtime.desktop as + Freedesktop.org's per-spec. + - Add tvtime-1.0.2-alsa.patch to enable audio routing from external TV card; + - debian/control: Build-depend on autoconf, automake, libasound2-dev, + libtool. + - debian/rules: Call autoreconf to re-generate the configure script. + * Dropped changes: + - Don't install usr/share/lintian/overrides directory, it's empty: fixed + in debian + + -- Lorenzo De Liso Tue, 13 Jul 2010 12:58:19 +0200 + +tvtime (1.0.2-6) unstable; urgency=low + + * debian/control: Depends: perl-modules. Closes: #566571. + * debian/rules: Edited clean rule for files in po/. + * po/pt.po: Replaced. Closes: #567225. + * debian/dirs: Removed usr/share/lintian/overrides/. + + -- Bart Martens Sun, 31 Jan 2010 18:33:36 +0000 + +tvtime (1.0.2-5ubuntu2) lucid; urgency=low + + * Add tvtime-1.0.2-alsa.patch to enable audio routing from external TV card; + thanks to Whoopie for the patch (LP: #340769). + * debian/control: Build-depend on autoconf,automake,libasound2-dev,libtool. + * debian/rules: Call autoreconf to re-generate the configure script. + + -- Alessio Treglia Thu, 07 Jan 2010 09:16:55 +0100 + +tvtime (1.0.2-5ubuntu1) lucid; urgency=low + + * Merge from debian testing, Ubuntu remaining changes: + - Add quilt support. + - debian/patches/tvtime-1.0.1-savematte.patch: tvtime does not rebember + matte settings (LP: #313570). + - debian/patches/desktop_file.patch: Fix docs/net-tvtime.desktop as + Freedesktop.org's per-spec. + - Don't install usr/share/lintian/overrides directory, it's empty. + + -- Alessio Treglia Mon, 09 Nov 2009 00:46:46 +0100 + +tvtime (1.0.2-5) unstable; urgency=low + + * src/xmltv.c: Replaced locale_t by tvtime_locale_t. + Fixes FTBFS with eglibc 2.10. Closes: #552594. + + -- Bart Martens Wed, 28 Oct 2009 17:46:25 +0100 + +tvtime (1.0.2-4) unstable; urgency=low + + * debian/control: Section: video. Closes: #540457. + * debian/po/ru.po: Replaced. Closes: #540853. + * debian/po/pt.po: Replaced. Closes: #541218. + * debian/po/it.po: Added. Closes: #541721. + * debian/po/fi.po: Added. Closes: #543052. + * debian/po/ja.po: Replaced. Closes: #545400. + * debian/po/vi.po: Replaced. Closes: #547918. + + -- Bart Martens Sun, 18 Oct 2009 14:07:45 +0200 + +tvtime (1.0.2-3ubuntu1) karmic; urgency=low + + * Add quilt support. + * debian/patches/tvtime-1.0.1-savematte.patch: tvtime does not rebember + matte settings (LP: #313570). + * debian/patches/glibc-2.10.patch: Prevent FTBFS with glibc 2.10. + * debian/patches/desktop_file.patch: Adjust docs/net-tvtime.desktop + according to Freedesktop.org's spec. + * debian/dirs: Remove usr/share/lintian/overrides, it's empty. + + -- Alessio Treglia Sun, 27 Sep 2009 17:56:32 +0200 + +tvtime (1.0.2-3) unstable; urgency=low + + * debian/templates, debian/control: Debconf templates and package description + rewritten. Closes: #535439. + * debian/po/eu.po: Added. Closes: #538985. + * debian/po/sv.po: Replaced. Closes: #539069. + * debian/po/pt.po: Replaced. Closes: #539990. + * debian/po/fr.po: Replaced. Closes: #540358. + * debian/po/de.po: Replaced. Closes: #539674. + * debian/watch: Updated. + * No longer overriding debian-watch-file-should-use-sf-redirector. + + -- Bart Martens Fri, 07 Aug 2009 18:24:59 +0200 + +tvtime (1.0.2-2) unstable; urgency=low + + * New maintainer. Closes: #487133. + * debian/watch: Updated. + * Overriding debian-watch-file-should-use-sf-redirector. + * Fixed using-imperative-form-in-templates and malformed-prompt-in-templates. + * docs/man/es/tvtime.xml.5: Fixed manpage-has-errors-from-man. + * debian/rules: Fixed dh-clean-k-is-deprecated. + * debian/postinst: Removed the MAKEDEV invocation. Closes: #492334, #444599. + * debian/control: No longer Depends on makedev. + Fixes depends-exclusively-on-makedev. + * debian/po/sv.po: Replaced. Closes: #502778. + * debian/copyright: Fixed old-fsf-address-in-copyright-file. + + -- Bart Martens Sun, 07 Jun 2009 23:30:37 +0200 + +tvtime (1.0.2-1) unstable; urgency=low + + * QA upload. + + Set maintainer to QA group. + + Acknowledge NMUs. Closes: #349194 (NMU patch bug) + Closes: #358884 #369176 #330290 #334865 #360804 #379049 + (Bugs tagged fixed) + * Move Homepage to dedicated field. + * Add makedev to dependencies since it uses it in postinst. + * Bump debhelper compat level from 4 to 7. + + Use dh_lintian + * Convert debian/copyright to UTF-8. + * Set menu and doc-base section to Applications/TV and Radio. + * Fix several formatting errors in man pages. + * Debconf translations: + - Galician added. Closes: #482099 + + -- Frank Lichtenheld Fri, 25 Jul 2008 01:42:06 +0200 + +tvtime (1.0.2-0.3) unstable; urgency=medium + + * Non-maintainer upload. + * Fix FTBFS by not including linux/compiler.h anymore. Thanks, + Sune Vuorela. Closes: #427603 + + -- Andreas Barth Thu, 28 Jun 2007 16:46:27 +0000 + +tvtime (1.0.2-0.2) unstable; urgency=low + + * Non-maintainer upload to fix pending l10n issues. + * Debconf translations: + - Spanish. Closes: #403492 + - Portuguese. Closes: #409698 + - Convert all po-debconf translations to UTF-8 + * Program translations: + - French completed + - Russian completed. Closes: #401399 + + -- Christian Perrier Sat, 24 Feb 2007 19:21:03 +0100 + +tvtime (1.0.2-0.1) unstable; urgency=medium + + * NMU with maintainer approval. + * New upstream release (Closes: #360804). + + Only change is the return of missing translations and to allow + noop to be bound to keys. + * Fix package purge when ucf is not available (Closes: #388605). + * Change chmod,chown calls in postinst, to preserve the setuid bit + (Closes: #369176). + * Updated debconf translations: + + Russian and Ukranian, thanks Andriy Lesyuk (Closes: #330290). + + Dutch, thanks Kurt de Bree (Closes: #379049). + + Swedish, thanks Danial Nylander (Closes: #334865). + + -- Thijs Kinkhorst Sun, 1 Oct 2006 17:43:14 +0200 + +tvtime (1.0.1-2.2) unstable; urgency=low + + * NMU as part of the GCC 4.1 transition. + * Remove extra qualifications from C++ files. (Closes: #358884) + + -- Martin Michlmayr Fri, 26 May 2006 20:05:18 +0200 + +tvtime (1.0.1-2.1) unstable; urgency=low + + * Non-maintainer upload. + * Replace build-dependency on xlibs-dev with an explicit build-dependency + on each required package. (Closes: #347077) + + -- Steinar H. Gunderson Sat, 21 Jan 2006 14:40:47 +0100 + +tvtime (1.0.1-2) unstable; urgency=low + + * Switch architecture to any, since tvtime no longer depends on i386 + assembly. + * Add debian/watch file. + + -- Simon Law Wed, 21 Sep 2005 10:06:30 -0400 + +tvtime (1.0.1-1) unstable; urgency=low + + * New upstream relase. (Closes: Bug#313645) + - Root no longer created $HOME/.tvtime. (Closes: Bug#301733) + - Corrected Australia's channel frequencies. (Closes: Bug#308407) + - --nowidescreen switch. (Closes: Bug#312656) + - Manpage fixes. (Closes: Bug#323541, #323542) + - Builds with GCC 4.0. (Closes: Bug#325345) + * Updated copyright information. (Closes: Bug#295914) + * We no longer need a .desktop entry in /usr/share/applnk/Multimedia. + (Closes: Bug#285384) + * Fixed encoding problem with German translation. (Closes: Bug#313891) + Thanks to Jens Seidel + * Added a Czech translation of the Debconf templates. (Closes: Bug#321739) + Thanks to Jan Outrata + * Added a Vietnamese Debconf translation. (Closes: Bug#322392) + Thanks to Clytie Siddall + * Don't suggest libdscaler, since it's no longer required. + * Build-Depend on fontforge. + + -- Simon Law Wed, 07 Sep 2005 19:38:49 -0400 + +tvtime (0.9.15-1) unstable; urgency=low + + * New upstream release. (Closes: Bug#276844) + - Control the soundcard's mixer. (Closes: Bug#231614) + * Add a Turkish translation of the Debconf templates. (Closes: Bug#249125) + Thanks to Recai Oktas + * Add a German translation of the Debconf templates. + (Closes: Bug#254696, #267128, + Thanks to Helge Kreutzmann + + -- Simon Law Tue, 16 Nov 2004 20:35:50 -0500 + +tvtime (0.9.12-2) unstable; urgency=medium + + * Add a Japanese translation of the debconf templates. (Closes: Bug#224165) + Thanks to Hideki Yamane + + -- Simon Law Tue, 13 Jan 2004 18:00:36 -0500 + +tvtime (0.9.12-1) unstable; urgency=low + + * New upstream release + - xmga mode has been removed. (Closes: Bug#216474) + - Wine is disabled on non-X86 systems. (Closes: Bug#213334) + * Switch to Architecture: any. + * FTBFS: Fix kernel-header error in wine/ldt_keeper.c. + (Closes: Bug#221094) + * Fix Debconf script so it doesn't emit Perl warnings. + * Actually put our .desktop entry into /usr/share/applnk/Multimedia + + -- Simon Law Sat, 29 Nov 2003 19:29:47 -0500 + +tvtime (0.9.10-9) unstable; urgency=low + + * Use strict POSIX shell functions in the postinst, for people with + minimal shells. (Closes: Bug#219818) + + -- Simon Law Sun, 09 Nov 2003 12:41:13 -0500 + +tvtime (0.9.10-8) unstable; urgency=low + + * Switch to gettext-based debconf templates. (Closes: Bug#217271) + Thanks to Michel Grentzinger + * Add a French translation of the debconf templates. (Closes: Bug#217272) + Also thanks to Michel. + + -- Simon Law Fri, 24 Oct 2003 10:22:55 -0400 + +tvtime (0.9.10-7) unstable; urgency=low + + * Add the website information to the description. + * Switch to DebHelper 4. + + -- Simon Law Sat, 11 Oct 2003 20:13:16 -0400 + +tvtime (0.9.10-6) unstable; urgency=low + + * Suggest libdscaler. (Closes: Bug#213512) + + -- Simon Law Sat, 04 Oct 2003 16:36:10 -0400 + +tvtime (0.9.10-5) unstable; urgency=low + + * Put our .desktop entry into /usr/share/applnk/Multimedia + + -- Simon Law Sat, 20 Sep 2003 07:52:35 -0400 + +tvtime (0.9.10-4) unstable; urgency=low + + * Depend: ucf so that the postinst works. (Closes: Bug#211330) + + -- Simon Law Wed, 17 Sep 2003 01:19:33 -0400 + +tvtime (0.9.10-3) unstable; urgency=low + + * Bump standards version to 3.5.10. + * Recommend xmltv-util, since people might want to take advantage of + the TV listings integration. + * Switch to Architecture: i386, since Wine only builds on i386. + + -- Simon Law Tue, 16 Sep 2003 11:23:30 -0400 + +tvtime (0.9.10-2) unstable; urgency=low + + * Fix the "download tvtime!" link in the HTML documentation. + + -- Simon Law Mon, 15 Sep 2003 20:59:04 -0400 + +tvtime (0.9.10-1) unstable; urgency=low + + * Initial upload. (Closes: Bug#171480) + * Patched to support DESTDIR. + * Patched to add an XPM icon for the X11 menu. + * Add more recent HTML documentation. + + -- Simon Law Mon, 15 Sep 2003 14:47:58 -0400 + --- tvtime-1.0.2.orig/debian/compat +++ tvtime-1.0.2/debian/compat @@ -0,0 +1 @@ +7 --- tvtime-1.0.2.orig/debian/config +++ tvtime-1.0.2/debian/config @@ -0,0 +1,276 @@ +#! /usr/bin/perl +# config - Debconf configuration for tvtime +# Copyright (C) 2003 Billy Biggs +# +# 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 + +use strict; +use warnings; +use English; +use Fcntl ':mode'; +use File::Copy; + +# Source debconf library +use Debconf::Client::ConfModule ':all'; +# Declare the version, and the ability to back up. +version(2.0); +capb('backup'); + + ### CONFIG FILE ARGUMENTS ### + +# Get the name of the XML config file +my $pkgsysconfdir = '/etc/tvtime'; +my $tvtime_xml = "$pkgsysconfdir/tvtime.xml"; +my $tvtime_configure = '/usr/bin/tvtime-configure'; + + ### DATA STRUCTURES ### + +# Each $options{} consists of a key with the name of the