From 7d14fa90f9c3565717a143d581b742574c4b23f8 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 22:38:05 +0000 Subject: [PATCH 01/56] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index bf9fcbd..0f5d919 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := abe SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From a0d3debfc4177cc0d1f6f26826850443499053f8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 09:31:44 +0000 Subject: [PATCH 02/56] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 0f5d919..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: abe -# $Id$ -NAME := abe -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) From 3201b68e7b9975f37e605a6fd6e86d14e7b5af3f Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Mon, 7 Feb 2011 18:07:35 -0600 Subject: [PATCH 03/56] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- abe.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abe.spec b/abe.spec index 89ce040..fced545 100644 --- a/abe.spec +++ b/abe.spec @@ -1,6 +1,6 @@ Name: abe Version: 1.1 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Scrolling, platform-jumping, ancient pyramid exploring game Group: Amusements/Games @@ -67,6 +67,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/pixmaps/%{name}.png %changelog +* Mon Feb 07 2011 Fedora Release Engineering - 1.1-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Fri Jul 24 2009 Fedora Release Engineering - 1.1-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild From 97aa039229754b68c51d54b09570f2ba5d0eda08 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Mon, 14 Mar 2011 10:59:57 -0600 Subject: [PATCH 04/56] * Mon Mar 14 2011 Jerry James - 1.1-13 - Fix double free (bz 509052) - Fix incorrectly-sized format specifier - Don't use abe's extra optimization and debugging CFLAGS (fixes debuginfo) - Remove filename extension from Icon field in desktop file - Remove BuildRoot tag - Add post/postun scripts, fix Requires for those scripts --- abe-1.1-doublefree.patch | 11 +++++++++++ abe-1.1-format.patch | 11 +++++++++++ abe.spec | 29 ++++++++++++++++++++++++----- 3 files changed, 46 insertions(+), 5 deletions(-) create mode 100644 abe-1.1-doublefree.patch create mode 100644 abe-1.1-format.patch diff --git a/abe-1.1-doublefree.patch b/abe-1.1-doublefree.patch new file mode 100644 index 0000000..41ae69b --- /dev/null +++ b/abe-1.1-doublefree.patch @@ -0,0 +1,11 @@ +--- src/Main.c.orig 2005-03-05 09:20:04.000000000 -0700 ++++ src/Main.c 2011-03-14 10:08:31.846413904 -0600 +@@ -35,8 +35,6 @@ + for(i = 0; modes[i]; ++i) + printf("\t%d x %d\n", modes[i]->w, modes[i]->h); + } +- +- free(modes); + } + + void diff --git a/abe-1.1-format.patch b/abe-1.1-format.patch new file mode 100644 index 0000000..129f5ce --- /dev/null +++ b/abe-1.1-format.patch @@ -0,0 +1,11 @@ +--- src/MapIO.c.orig 2005-03-05 09:20:04.000000000 -0700 ++++ src/MapIO.c 2011-03-14 10:15:33.166949366 -0600 +@@ -93,7 +93,7 @@ + // compression step 1: read compressed data from disk + // FIXME: what would be nicer is to only allocate as much mem as used on disk. + size = LEVEL_COUNT * map.w * map.h; +- printf("size %u\n", size); ++ printf("size %zu\n", size); + fflush(stdout); + if(!(read_buff = (Uint16 *) malloc(sizeof(Uint16) * size))) { + fprintf(stderr, "Out of memory on map read."); diff --git a/abe.spec b/abe.spec index fced545..9db501d 100644 --- a/abe.spec +++ b/abe.spec @@ -1,6 +1,6 @@ Name: abe Version: 1.1 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Scrolling, platform-jumping, ancient pyramid exploring game Group: Amusements/Games @@ -9,13 +9,14 @@ URL: http://abe.sourceforge.net/ Source0: http://downloads.sourceforge.net/abe/abe-%{version}.tar.gz Source1: %{name}.png Patch0: abe-1.1-settings.patch +Patch1: abe-1.1-doublefree.patch +Patch2: abe-1.1-format.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL-devel >= 1.2.3, SDL_mixer-devel >= 1.2.3 BuildRequires: libXmu-devel libXi-devel BuildRequires: desktop-file-utils -Requires(post): coreutils -Requires(postun): coreutils +Requires(post): desktop-file-utils +Requires(postun): desktop-file-utils %description A scrolling, platform-jumping, key-collecting, ancient pyramid exploring game, @@ -24,9 +25,12 @@ vaguely in the style of similar games for the Commodore+4. %prep %setup -q %patch0 -p1 +%patch1 +%patch2 %build %configure --with-data-dir=%{_datadir}/%{name} +sed -i "s/^CFLAGS =.*/CFLAGS = ${RPM_OPT_FLAGS} \$\(SDL_CFLAGS\)/" src/Makefile make %{?_smp_mflags} %install @@ -45,7 +49,7 @@ cat << EOF > %{name}.desktop Name=Abe Comment="Abe's Amazing Adventure" Exec=abe -Icon=abe.png +Icon=abe Terminal=false Type=Application Encoding=UTF-8 @@ -57,6 +61,13 @@ desktop-file-install --vendor fedora --dir $RPM_BUILD_ROOT/%{_datadir}/applicati %clean rm -rf $RPM_BUILD_ROOT +%post +update-desktop-database %{_datadir}/applications &>/dev/null + +%postun +if [ $1 -eq 0 ]; then + update-desktop-database %{_datadir}/applications &>/dev/null +fi %files %defattr(-,root,root,-) @@ -67,6 +78,14 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/pixmaps/%{name}.png %changelog +* Mon Mar 14 2011 Jerry James - 1.1-13 +- Fix double free (bz 509052) +- Fix incorrectly-sized format specifier +- Don't use abe's extra optimization and debugging CFLAGS (fixes debuginfo) +- Remove filename extension from Icon field in desktop file +- Remove BuildRoot tag +- Add post/postun scripts, fix Requires for those scripts + * Mon Feb 07 2011 Fedora Release Engineering - 1.1-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From 8b1481eb33913a8aeb572f7b8af5a2d10c172899 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Fri, 6 Jan 2012 16:14:04 -0700 Subject: [PATCH 05/56] Rebuild for GCC 4.7. Remove bogus script Requires. Remove unnecessary spec file elements (%clean script, etc.). --- abe.spec | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/abe.spec b/abe.spec index 9db501d..0beff38 100644 --- a/abe.spec +++ b/abe.spec @@ -1,6 +1,6 @@ Name: abe Version: 1.1 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Scrolling, platform-jumping, ancient pyramid exploring game Group: Amusements/Games @@ -15,8 +15,6 @@ Patch2: abe-1.1-format.patch BuildRequires: SDL-devel >= 1.2.3, SDL_mixer-devel >= 1.2.3 BuildRequires: libXmu-devel libXi-devel BuildRequires: desktop-file-utils -Requires(post): desktop-file-utils -Requires(postun): desktop-file-utils %description A scrolling, platform-jumping, key-collecting, ancient pyramid exploring game, @@ -34,7 +32,6 @@ sed -i "s/^CFLAGS =.*/CFLAGS = ${RPM_OPT_FLAGS} \$\(SDL_CFLAGS\)/" src/Makefile make %{?_smp_mflags} %install -rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install # make install does not copy the game data files. @@ -58,9 +55,6 @@ EOF desktop-file-install --vendor fedora --dir $RPM_BUILD_ROOT/%{_datadir}/applications/ %{name}.desktop -%clean -rm -rf $RPM_BUILD_ROOT - %post update-desktop-database %{_datadir}/applications &>/dev/null @@ -70,7 +64,6 @@ if [ $1 -eq 0 ]; then fi %files -%defattr(-,root,root,-) %doc COPYING README %{_bindir}/* %{_datadir}/%{name} @@ -78,6 +71,11 @@ fi %{_datadir}/pixmaps/%{name}.png %changelog +* Fri Jan 6 2012 Jerry James - 1.1-14 +- Rebuild for GCC 4.7 +- Remove bogus script Requires +- Remove unnecessary spec file elements (clean script, etc.) + * Mon Mar 14 2011 Jerry James - 1.1-13 - Fix double free (bz 509052) - Fix incorrectly-sized format specifier From bf60a0b2c144e5d22672733ee1efe8a6f22960df Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 12 Jan 2012 14:56:54 -0600 Subject: [PATCH 06/56] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- abe.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abe.spec b/abe.spec index 0beff38..32acac6 100644 --- a/abe.spec +++ b/abe.spec @@ -1,6 +1,6 @@ Name: abe Version: 1.1 -Release: 14%{?dist} +Release: 15%{?dist} Summary: Scrolling, platform-jumping, ancient pyramid exploring game Group: Amusements/Games @@ -71,6 +71,9 @@ fi %{_datadir}/pixmaps/%{name}.png %changelog +* Thu Jan 12 2012 Fedora Release Engineering - 1.1-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Fri Jan 6 2012 Jerry James - 1.1-14 - Rebuild for GCC 4.7 - Remove bogus script Requires From 25d762ce57f2f02c6508bce0ee3d68d298e449ca Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 18 Jul 2012 10:27:51 -0500 Subject: [PATCH 07/56] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- abe.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abe.spec b/abe.spec index 32acac6..2493cb1 100644 --- a/abe.spec +++ b/abe.spec @@ -1,6 +1,6 @@ Name: abe Version: 1.1 -Release: 15%{?dist} +Release: 16%{?dist} Summary: Scrolling, platform-jumping, ancient pyramid exploring game Group: Amusements/Games @@ -71,6 +71,9 @@ fi %{_datadir}/pixmaps/%{name}.png %changelog +* Wed Jul 18 2012 Fedora Release Engineering - 1.1-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Thu Jan 12 2012 Fedora Release Engineering - 1.1-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild From bff28c2e809d7d5923736754783a94646dcb89ce Mon Sep 17 00:00:00 2001 From: Rahul Sundaram Date: Sat, 9 Feb 2013 00:22:57 -0500 Subject: [PATCH 08/56] Remove vendor tag from desktop file. https://fedorahosted.org/fpc/ticket/247 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- abe.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/abe.spec b/abe.spec index 2493cb1..bd4ca27 100644 --- a/abe.spec +++ b/abe.spec @@ -1,6 +1,6 @@ Name: abe Version: 1.1 -Release: 16%{?dist} +Release: 17%{?dist} Summary: Scrolling, platform-jumping, ancient pyramid exploring game Group: Amusements/Games @@ -53,7 +53,7 @@ Encoding=UTF-8 Categories=Game;ArcadeGame; EOF -desktop-file-install --vendor fedora --dir $RPM_BUILD_ROOT/%{_datadir}/applications/ %{name}.desktop +desktop-file-install --dir $RPM_BUILD_ROOT/%{_datadir}/applications/ %{name}.desktop %post update-desktop-database %{_datadir}/applications &>/dev/null @@ -67,10 +67,13 @@ fi %doc COPYING README %{_bindir}/* %{_datadir}/%{name} -%{_datadir}/applications/*.desktop +%{_datadir}/applications/%{name}.desktop %{_datadir}/pixmaps/%{name}.png %changelog +* Sat Feb 09 2013 Rahul Sundaram - 1.1-17 +- Remove vendor tag from desktop file. https://fedorahosted.org/fpc/ticket/247 + * Wed Jul 18 2012 Fedora Release Engineering - 1.1-16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From 6443e6ab0811bd08d116f32a517f16c1bb17c827 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Mon, 25 Mar 2013 10:49:52 -0600 Subject: [PATCH 09/56] Add aarch64 support (bz 924964). Fix the FSF's address in COPYING. Add comments on the upstream status of each patch. Remove deprecated "Encoding" key from desktop file. --- abe-1.1-aarch64.patch | 3067 ++++++++++++++++++++++++++++++++++++++++ abe-1.1-settings.patch | 5 +- abe.spec | 33 +- 3 files changed, 3095 insertions(+), 10 deletions(-) create mode 100644 abe-1.1-aarch64.patch diff --git a/abe-1.1-aarch64.patch b/abe-1.1-aarch64.patch new file mode 100644 index 0000000..5827a0d --- /dev/null +++ b/abe-1.1-aarch64.patch @@ -0,0 +1,3067 @@ +--- config.guess.orig 2005-03-05 10:20:39.000000000 -0600 ++++ config.guess 2013-03-03 00:30:18.802031358 -0600 +@@ -1,9 +1,10 @@ + #! /bin/sh + # Attempt to guess a canonical system name. +-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 +-# Free Software Foundation, Inc. ++# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, ++# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, ++# 2011, 2012 Free Software Foundation, Inc. + +-timestamp='2001-09-04' ++timestamp='2012-09-25' + + # 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 +@@ -16,23 +17,24 @@ + # 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. + +-# Written by Per Bothner . +-# Please send patches to . ++ ++# Originally written by Per Bothner. Please send patches (context ++# diff format) to and include a ChangeLog ++# entry. + # + # This script attempts to guess a canonical system name similar to + # config.sub. If it succeeds, it prints the system name on stdout, and + # exits with 0. Otherwise, it exits with 1. + # +-# The plan is that this can be called by configure scripts if you +-# don't specify an explicit build system type. ++# 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 + + me=`echo "$0" | sed -e 's,.*/,,'` + +@@ -52,7 +54,8 @@ + GNU config.guess ($timestamp) + + Originally written by Per Bothner. +-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 ++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, ++2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 + Free Software Foundation, Inc. + + This is free software; see the source for copying conditions. There is NO +@@ -65,11 +68,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. +@@ -87,30 +90,42 @@ + exit 1 + fi + ++trap 'exit 1' 1 2 15 + +-dummy=dummy-$$ +-trap 'rm -f $dummy.c $dummy.o $dummy.rel $dummy; exit 1' 1 2 15 ++# CC_FOR_BUILD -- compiler used by this script. Note that the use of a ++# compiler to aid in system detection is discouraged as it requires ++# temporary files to be created and, as you can see below, it is a ++# headache to deal with in a portable fashion. + +-# CC_FOR_BUILD -- compiler used by this script. + # Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still + # use `HOST_CC' if defined, but it is deprecated. + +-set_cc_for_build='case $CC_FOR_BUILD,$HOST_CC,$CC in +- ,,) echo "int dummy(){}" > $dummy.c ; +- for c in cc gcc c89 ; do +- ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1 ; +- if test $? = 0 ; then ++# Portable tmp directory creation inspired by the Autoconf team. ++ ++set_cc_for_build=' ++trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; ++trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; ++: ${TMPDIR=/tmp} ; ++ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || ++ { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || ++ { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || ++ { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; ++dummy=$tmp/dummy ; ++tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; ++case $CC_FOR_BUILD,$HOST_CC,$CC in ++ ,,) echo "int x;" > $dummy.c ; ++ for c in cc gcc c89 c99 ; do ++ if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then + CC_FOR_BUILD="$c"; break ; + fi ; + done ; +- rm -f $dummy.c $dummy.o $dummy.rel ; + if test x"$CC_FOR_BUILD" = x ; then + CC_FOR_BUILD=no_compiler_found ; + fi + ;; + ,,*) 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) +@@ -127,32 +142,34 @@ + + 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*, ++ # NetBSD (nbsd) targets should (where applicable) match one or ++ # 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 + # compatibility and a consistent mechanism for selecting the + # object file format. +- # Determine the machine/vendor (is the vendor relevant). +- case "${UNAME_MACHINE}" in +- amiga) machine=m68k-unknown ;; +- arm32) machine=arm-unknown ;; +- atari*) machine=m68k-atari ;; +- sun3*) machine=m68k-sun ;; +- mac68k) machine=m68k-apple ;; +- macppc) machine=powerpc-apple ;; +- hp3[0-9][05]) machine=m68k-hp ;; +- ibmrt|romp-ibm) machine=romp-ibm ;; +- *) machine=${UNAME_MACHINE}-unknown ;; ++ # ++ # Note: NetBSD doesn't particularly care about the vendor ++ # portion of the name. We always set it to "unknown". ++ sysctl="sysctl -n hw.machine_arch" ++ UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \ ++ /usr/sbin/$sysctl 2>/dev/null || echo unknown)` ++ case "${UNAME_MACHINE_ARCH}" in ++ armeb) machine=armeb-unknown ;; ++ arm*) machine=arm-unknown ;; ++ sh3el) machine=shl-unknown ;; ++ sh3eb) machine=sh-unknown ;; ++ sh5el) machine=sh5le-unknown ;; ++ *) machine=${UNAME_MACHINE_ARCH}-unknown ;; + esac + # The Operating System including object format, if it has switched + # to ELF recently, or will in the future. +- case "${UNAME_MACHINE}" in +- i386|sparc|amiga|arm*|hp300|mvme68k|vax|atari|luna68k|mac68k|news68k|next68k|pc532|sun3*|x68k) ++ case "${UNAME_MACHINE_ARCH}" in ++ arm*|i386|m68k|ns32k|sh3*|sparc|vax) + eval $set_cc_for_build + if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ +- | grep __ELF__ >/dev/null ++ | grep -q __ELF__ + then + # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). + # Return netbsd for either. FIX? +@@ -162,124 +179,139 @@ + fi + ;; + *) +- os=netbsd ++ os=netbsd + ;; + esac + # The OS release +- release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` ++ # Debian GNU/NetBSD machines have a different userland, and ++ # thus, need a distinct triplet. However, they do not need ++ # kernel version information, so it can be replaced with a ++ # suitable tag, in the style of linux-gnu. ++ case "${UNAME_VERSION}" in ++ Debian*) ++ release='-gnu' ++ ;; ++ *) ++ release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` ++ ;; ++ esac + # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: + # contains redundant information, the shorter form: + # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. + echo "${machine}-${os}${release}" +- exit 0 ;; ++ exit ;; ++ *:Bitrig:*:*) ++ UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` ++ echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE} ++ exit ;; ++ *:OpenBSD:*:*) ++ 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 ;; ++ *:SolidBSD:*:*) ++ echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} ++ exit ;; ++ macppc:MirBSD:*:*) ++ echo powerpc-unknown-mirbsd${UNAME_RELEASE} ++ exit ;; ++ *:MirBSD:*:*) ++ echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} ++ exit ;; + alpha:OSF1:*:*) +- if test $UNAME_RELEASE = "V4.0"; then ++ case $UNAME_RELEASE in ++ *4.0) + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` +- fi ++ ;; ++ *5.*) ++ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` ++ ;; ++ esac ++ # According to Compaq, /usr/sbin/psrinfo has been available on ++ # OSF/1 and Tru64 systems produced since 1995. I hope that ++ # covers most systems running today. This code pipes the CPU ++ # types through head -n 1, so we only detect the type of CPU 0. ++ ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` ++ case "$ALPHA_CPU_TYPE" in ++ "EV4 (21064)") ++ UNAME_MACHINE="alpha" ;; ++ "EV4.5 (21064)") ++ UNAME_MACHINE="alpha" ;; ++ "LCA4 (21066/21068)") ++ UNAME_MACHINE="alpha" ;; ++ "EV5 (21164)") ++ UNAME_MACHINE="alphaev5" ;; ++ "EV5.6 (21164A)") ++ UNAME_MACHINE="alphaev56" ;; ++ "EV5.6 (21164PC)") ++ UNAME_MACHINE="alphapca56" ;; ++ "EV5.7 (21164PC)") ++ UNAME_MACHINE="alphapca57" ;; ++ "EV6 (21264)") ++ UNAME_MACHINE="alphaev6" ;; ++ "EV6.7 (21264A)") ++ UNAME_MACHINE="alphaev67" ;; ++ "EV6.8CB (21264C)") ++ UNAME_MACHINE="alphaev68" ;; ++ "EV6.8AL (21264B)") ++ UNAME_MACHINE="alphaev68" ;; ++ "EV6.8CX (21264D)") ++ UNAME_MACHINE="alphaev68" ;; ++ "EV6.9A (21264/EV69A)") ++ UNAME_MACHINE="alphaev69" ;; ++ "EV7 (21364)") ++ UNAME_MACHINE="alphaev7" ;; ++ "EV7.9 (21364A)") ++ UNAME_MACHINE="alphaev79" ;; ++ esac ++ # A Pn.n version is a patched version. + # A Vn.n version is a released version. + # A Tn.n version is a released field test version. + # A Xn.n version is an unreleased experimental baselevel. + # 1.2 uses "1.2" for uname -r. +- cat <$dummy.s +- .data +-\$Lformat: +- .byte 37,100,45,37,120,10,0 # "%d-%x\n" +- +- .text +- .globl main +- .align 4 +- .ent main +-main: +- .frame \$30,16,\$26,0 +- ldgp \$29,0(\$27) +- .prologue 1 +- .long 0x47e03d80 # implver \$0 +- lda \$2,-1 +- .long 0x47e20c21 # amask \$2,\$1 +- lda \$16,\$Lformat +- mov \$0,\$17 +- not \$1,\$18 +- jsr \$26,printf +- ldgp \$29,0(\$26) +- mov 0,\$16 +- jsr \$26,exit +- .end main +-EOF +- eval $set_cc_for_build +- $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null +- if test "$?" = 0 ; then +- case `./$dummy` in +- 0-0) +- UNAME_MACHINE="alpha" +- ;; +- 1-0) +- UNAME_MACHINE="alphaev5" +- ;; +- 1-1) +- UNAME_MACHINE="alphaev56" +- ;; +- 1-101) +- UNAME_MACHINE="alphapca56" +- ;; +- 2-303) +- UNAME_MACHINE="alphaev6" +- ;; +- 2-307) +- UNAME_MACHINE="alphaev67" +- ;; +- 2-1307) +- UNAME_MACHINE="alphaev68" +- ;; +- esac +- fi +- rm -f $dummy.s $dummy +- echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` +- exit 0 ;; ++ echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` ++ # 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;; +- amiga:OpenBSD:*:*) +- echo m68k-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + *:[Aa]miga[Oo][Ss]:*:*) + echo ${UNAME_MACHINE}-unknown-amigaos +- exit 0 ;; +- arc64:OpenBSD:*:*) +- echo mips64el-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- arc:OpenBSD:*:*) +- echo mipsel-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- hkmips:OpenBSD:*:*) +- echo mips-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- pmax:OpenBSD:*:*) +- echo mipsel-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- sgi:OpenBSD:*:*) +- echo mips-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- wgrisc:OpenBSD:*:*) +- echo mipsel-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; ++ *:[Mm]orph[Oo][Ss]:*:*) ++ echo ${UNAME_MACHINE}-unknown-morphos ++ exit ;; + *:OS/390:*:*) + echo i370-ibm-openedition +- exit 0 ;; ++ exit ;; ++ *:z/VM:*:*) ++ echo s390-ibm-zvmoe ++ exit ;; ++ *:OS400:*:*) ++ 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 +@@ -287,25 +319,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 ;; ++ 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 ;; ++ 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*) +@@ -314,12 +372,12 @@ + 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=`(head -1 /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` ++ UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` + test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 + case "`/bin/arch`" in + sun3) +@@ -329,16 +387,10 @@ + echo sparc-sun-sunos${UNAME_RELEASE} + ;; + esac +- exit 0 ;; ++ exit ;; + aushp:SunOS:*:*) + echo sparc-auspex-sunos${UNAME_RELEASE} +- exit 0 ;; +- sparc*:NetBSD:*) +- echo `uname -p`-unknown-netbsd${UNAME_RELEASE} +- exit 0 ;; +- atari*:OpenBSD:*:*) +- echo m68k-unknown-openbsd${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 +@@ -348,50 +400,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 ;; +- sun3*:OpenBSD:*:*) +- echo m68k-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- mac68k:OpenBSD:*:*) +- echo m68k-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- mvme68k:OpenBSD:*:*) +- echo m68k-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- mvme88k:OpenBSD:*:*) +- echo m88k-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; ++ echo m68k-unknown-mint${UNAME_RELEASE} ++ exit ;; ++ m68k:machten:*:*) ++ echo m68k-apple-machten${UNAME_RELEASE} ++ 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 +@@ -415,30 +458,36 @@ + exit (-1); + } + EOF +- $CC_FOR_BUILD $dummy.c -o $dummy \ +- && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ +- && rm -f $dummy.c $dummy && exit 0 +- rm -f $dummy.c $dummy ++ $CC_FOR_BUILD -o $dummy $dummy.c && ++ 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 ;; ++ Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) ++ echo powerpc-harris-powermax ++ 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 ] || \ +@@ -451,29 +500,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` +@@ -481,7 +530,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 +@@ -496,17 +545,20 @@ + exit(0); + } + EOF +- $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0 +- rm -f $dummy.c $dummy +- 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]) +- IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'` ++ 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 + else +@@ -518,96 +570,114 @@ + 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 + 9000/31? ) HP_ARCH=m68000 ;; + 9000/[34]?? ) HP_ARCH=m68k ;; + 9000/[678][0-9][0-9]) +- case "${HPUX_REV}" in +- 11.[0-9][0-9]) +- if [ -x /usr/bin/getconf ]; then +- sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` +- 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" ;; +- esac ;; +- esac +- fi ;; +- esac +- if [ "${HP_ARCH}" = "" ]; then +- eval $set_cc_for_build +- sed 's/^ //' << EOF >$dummy.c +- +- #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); +- } ++ 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" ;; ++ '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 ++ esac ;; ++ esac ++ fi ++ if [ "${HP_ARCH}" = "" ]; then ++ eval $set_cc_for_build ++ sed 's/^ //' << EOF >$dummy.c ++ ++ #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); ++ } + EOF +- (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy` +- if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi +- rm -f $dummy.c $dummy +- fi ;; ++ (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` ++ test -z "$HP_ARCH" && HP_ARCH=hppa ++ fi ;; + esac ++ if [ ${HP_ARCH} = "hppa2.0w" ] ++ then ++ 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 ++ HP_ARCH="hppa64" ++ 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 +@@ -635,158 +705,176 @@ + exit (0); + } + EOF +- $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0 +- rm -f $dummy.c $dummy ++ $CC_FOR_BUILD -o $dummy $dummy.c && 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 ;; +- hppa*:OpenBSD:*:*) +- echo hppa-unknown-openbsd +- 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 ;; +- CRAY*X-MP:*:*:*) +- echo xmp-cray-unicos +- 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 ;; +- CRAY*T3D:*:*:*) +- echo alpha-cray-unicosmk${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 ;; +- CRAY-2:*:*:*) +- echo cray2-cray-unicos +- exit 0 ;; ++ exit ;; ++ *:UNICOS/mp:*:*) ++ echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' ++ 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 ;; +- hp300:OpenBSD:*:*) +- echo m68k-unknown-openbsd${UNAME_RELEASE} +- 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 ;; + 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 ;; +- *:OpenBSD:*:*) +- echo ${UNAME_MACHINE}-unknown-openbsd`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 ;; ++ 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 ;; ++ 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 i386-pc-interix +- exit 0 ;; ++ echo i586-pc-interix ++ 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 ;; ++ 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 ;; + i*86:Minix:*:*) + echo ${UNAME_MACHINE}-pc-minix +- exit 0 ;; +- arm*:Linux:*:*) ++ exit ;; ++ aarch64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu +- exit 0 ;; +- ia64:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux +- exit 0 ;; +- m68*:Linux:*:*) ++ exit ;; ++ aarch64_be:Linux:*:*) ++ UNAME_MACHINE=aarch64_be + echo ${UNAME_MACHINE}-unknown-linux-gnu +- exit 0 ;; +- mips:Linux:*:*) +- case `sed -n '/^byte/s/^.*: \(.*\) endian/\1/p' < /proc/cpuinfo` in +- big) echo mips-unknown-linux-gnu && exit 0 ;; +- little) echo mipsel-unknown-linux-gnu && exit 0 ;; +- esac +- ;; +- ppc:Linux:*:*) +- echo powerpc-unknown-linux-gnu +- exit 0 ;; +- ppc64:Linux:*:*) +- echo powerpc64-unknown-linux-gnu +- exit 0 ;; ++ exit ;; + alpha:Linux:*:*) + case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in + EV5) UNAME_MACHINE=alphaev5 ;; +@@ -796,11 +884,90 @@ + EV6) UNAME_MACHINE=alphaev6 ;; + EV67) UNAME_MACHINE=alphaev67 ;; + EV68*) UNAME_MACHINE=alphaev68 ;; +- esac +- objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null ++ esac ++ objdump --private-headers /bin/sh | grep -q ld.so.1 + if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi + echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} +- exit 0 ;; ++ exit ;; ++ arm*:Linux:*:*) ++ 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-gnu ++ else ++ if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ ++ | grep -q __ARM_PCS_VFP ++ then ++ echo ${UNAME_MACHINE}-unknown-linux-gnueabi ++ else ++ echo ${UNAME_MACHINE}-unknown-linux-gnueabihf ++ fi ++ fi ++ exit ;; ++ avr32*:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; ++ cris:Linux:*:*) ++ echo ${UNAME_MACHINE}-axis-linux-gnu ++ exit ;; ++ crisv32:Linux:*:*) ++ echo ${UNAME_MACHINE}-axis-linux-gnu ++ exit ;; ++ frv:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; ++ hexagon:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; ++ i*86:Linux:*:*) ++ LIBC=gnu ++ eval $set_cc_for_build ++ sed 's/^ //' << EOF >$dummy.c ++ #ifdef __dietlibc__ ++ LIBC=dietlibc ++ #endif ++EOF ++ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` ++ echo "${UNAME_MACHINE}-pc-linux-${LIBC}" ++ exit ;; ++ ia64:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; ++ m32r*:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; ++ m68*:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; ++ mips:Linux:*:* | mips64:Linux:*:*) ++ eval $set_cc_for_build ++ sed 's/^ //' << EOF >$dummy.c ++ #undef CPU ++ #undef ${UNAME_MACHINE} ++ #undef ${UNAME_MACHINE}el ++ #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) ++ CPU=${UNAME_MACHINE}el ++ #else ++ #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) ++ 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; } ++ ;; ++ or32:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; ++ padre:Linux:*:*) ++ echo sparc-unknown-linux-gnu ++ exit ;; ++ parisc64:Linux:*:* | hppa64:Linux:*:*) ++ echo hppa64-unknown-linux-gnu ++ exit ;; + parisc:Linux:*:* | hppa:Linux:*:*) + # Look for CPU level + case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in +@@ -808,92 +975,71 @@ + PA8*) echo hppa2.0-unknown-linux-gnu ;; + *) echo hppa-unknown-linux-gnu ;; + esac +- exit 0 ;; +- parisc64:Linux:*:* | hppa64:Linux:*:*) +- echo hppa64-unknown-linux-gnu +- exit 0 ;; ++ exit ;; ++ ppc64:Linux:*:*) ++ echo powerpc64-unknown-linux-gnu ++ exit ;; ++ ppc:Linux:*:*) ++ echo powerpc-unknown-linux-gnu ++ exit ;; + s390:Linux:*:* | s390x:Linux:*:*) + echo ${UNAME_MACHINE}-ibm-linux +- exit 0 ;; ++ exit ;; ++ sh64*:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; + sh*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu +- exit 0 ;; ++ exit ;; + sparc:Linux:*:* | sparc64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu +- exit 0 ;; ++ exit ;; ++ tile*:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; ++ vax:Linux:*:*) ++ echo ${UNAME_MACHINE}-dec-linux-gnu ++ 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. +- ld_supported_targets=`cd /; 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 +- cat >$dummy.c < +-#ifdef __cplusplus +-#include /* for printf() prototype */ +- int main (int argc, char *argv[]) { +-#else +- int main (argc, argv) int argc; char *argv[]; { +-#endif +-#ifdef __ELF__ +-# ifdef __GLIBC__ +-# if __GLIBC__ >= 2 +- printf ("%s-pc-linux-gnu\n", argv[1]); +-# else +- printf ("%s-pc-linux-gnulibc1\n", argv[1]); +-# endif +-# else +- printf ("%s-pc-linux-gnulibc1\n", argv[1]); +-# endif +-#else +- printf ("%s-pc-linux-gnuaout\n", argv[1]); +-#endif +- return 0; +-} +-EOF +- $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm -f $dummy.c $dummy && exit 0 +- rm -f $dummy.c $dummy +- test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 +- ;; ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; ++ xtensa*:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ 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 ;; ++ i*86:XTS-300:*:STOP) ++ echo ${UNAME_MACHINE}-unknown-stop ++ exit ;; ++ i*86:atheos:*:*) ++ echo ${UNAME_MACHINE}-unknown-atheos ++ exit ;; ++ i*86:syllable:*:*) ++ echo ${UNAME_MACHINE}-pc-syllable ++ exit ;; ++ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) ++ echo i386-unknown-lynxos${UNAME_RELEASE} ++ exit ;; ++ i*86:*DOS:*:*) ++ echo ${UNAME_MACHINE}-pc-msdosdjgpp ++ 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 +@@ -901,99 +1047,113 @@ + 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 >/dev/null ; then +- UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')` +- (/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486 +- (/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \ ++ UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` ++ (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 ++ (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \ + && UNAME_MACHINE=i586 +- (/bin/uname -X|egrep '^Machine.*Pent ?II' >/dev/null) \ ++ (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \ + && UNAME_MACHINE=i686 +- (/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) \ ++ (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ + && UNAME_MACHINE=i686 + echo ${UNAME_MACHINE}-pc-sco$UNAME_REL + else + echo ${UNAME_MACHINE}-pc-sysv32 + fi +- exit 0 ;; +- i*86:*DOS:*:*) +- echo ${UNAME_MACHINE}-pc-msdosdjgpp +- exit 0 ;; ++ exit ;; + pc:*:*:*) + # Left here for compatibility: +- # uname -m prints for DJGPP always 'pc', but it prints nothing about +- # the processor, so we play safe by assuming i386. +- echo i386-pc-msdosdjgpp +- exit 0 ;; ++ # uname -m prints for DJGPP always 'pc', but it prints nothing about ++ # the processor, so we play safe by assuming i586. ++ # Note: whatever this is, it MUST be the same as what config.sub ++ # prints for the "djgpp" host, or else GDB configury will decide that ++ # this is a cross-build. ++ echo i586-pc-msdosdjgpp ++ exit ;; + Intel:Mach:3*:*) + echo i386-pc-mach3 +- exit 0 ;; ++ exit ;; + paragon:*:*:*) + echo i860-intel-osf1 +- exit 0 ;; ++ exit ;; + i860:*:4.*:*) # i860-SVR4 + if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then + echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 + else # Add other i860-SVR4 vendors below as they are discovered. + echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 + fi +- exit 0 ;; ++ exit ;; + mini*:CTIX:SYS*5:*) + # "miniframe" + echo m68010-convergent-sysv +- exit 0 ;; +- M68*:*:R3V[567]*:*) +- test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; +- 3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0) ++ exit ;; ++ mc68k:UNIX:SYSTEM5:3.51m) ++ echo m68k-convergent-sysv ++ exit ;; ++ M680?0:D-NIX:5.3:*) ++ echo m68k-diab-dnix ++ exit ;; ++ M68*:*:R3V[5678]*:*) ++ 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 ;; +- i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) +- echo i386-unknown-lynxos${UNAME_RELEASE} +- 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` +@@ -1001,82 +1161,126 @@ + 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 ;; ++ 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:*:*) +- echo `uname -p`-apple-darwin${UNAME_RELEASE} +- exit 0 ;; ++ UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown ++ case $UNAME_PROCESSOR in ++ i386) ++ eval $set_cc_for_build ++ 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 ++ UNAME_PROCESSOR="x86_64" ++ fi ++ fi ;; ++ unknown) UNAME_PROCESSOR=powerpc ;; ++ esac ++ echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} ++ exit ;; + *:procnto*:*:* | *:QNX:[0123456789]*:*) +- if test "${UNAME_MACHINE}" = "x86pc"; then ++ UNAME_PROCESSOR=`uname -p` ++ if test "$UNAME_PROCESSOR" = "x86"; then ++ UNAME_PROCESSOR=i386 + UNAME_MACHINE=pc + fi +- echo `uname -p`-${UNAME_MACHINE}-nto-qnx +- exit 0 ;; ++ echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} ++ exit ;; + *:QNX:*:4*) + echo i386-pc-qnx +- exit 0 ;; +- NSR-[KW]:NONSTOP_KERNEL:*:*) ++ 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 +@@ -1087,41 +1291,55 @@ + UNAME_MACHINE="$cputype" + fi + echo ${UNAME_MACHINE}-unknown-plan9 +- exit 0 ;; +- i*86:OS/2:*:*) +- # If we were able to find `uname', then EMX Unix compatibility +- # is probably installed. +- echo ${UNAME_MACHINE}-pc-os2-emx +- exit 0 ;; ++ 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 ;; +- i*86:XTS-300:*:STOP) +- echo ${UNAME_MACHINE}-unknown-stop +- exit 0 ;; +- i*86:atheos:*:*) +- echo ${UNAME_MACHINE}-unknown-atheos +- exit 0 ;; ++ exit ;; ++ SEI:*:*:SEIUX) ++ echo mips-sei-seiux${UNAME_RELEASE} ++ exit ;; ++ *:DragonFly:*:*) ++ echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ++ exit ;; ++ *:*VMS:*:*) ++ UNAME_MACHINE=`(uname -p) 2>/dev/null` ++ case "${UNAME_MACHINE}" in ++ 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 ;; ++ 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) +@@ -1237,12 +1455,12 @@ + } + EOF + +-$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm -f $dummy.c $dummy && exit 0 +-rm -f $dummy.c $dummy ++$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && 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) + +@@ -1251,22 +1469,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 + +@@ -1277,7 +1495,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 +--- config.sub.orig 2005-03-05 10:20:39.000000000 -0600 ++++ config.sub 2013-03-03 00:30:18.841026879 -0600 +@@ -1,9 +1,10 @@ + #! /bin/sh + # Configuration validation subroutine script. +-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 +-# Free Software Foundation, Inc. ++# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, ++# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, ++# 2011, 2012 Free Software Foundation, Inc. + +-timestamp='2001-09-07' ++timestamp='2012-10-10' + + # This file is (in principle) common to ALL GNU software. + # The presence of a machine in this file suggests that SOME GNU software +@@ -20,22 +21,25 @@ + # 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. + +-# Please send patches to . ++ ++# Please send patches to . Submit a context ++# diff and a properly formatted GNU ChangeLog entry. + # + # 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. +@@ -69,7 +73,8 @@ + version="\ + GNU config.sub ($timestamp) + +-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 ++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, ++2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 + Free Software Foundation, Inc. + + This is free software; see the source for copying conditions. There is NO +@@ -82,11 +87,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. +@@ -98,7 +103,7 @@ + *local*) + # First pass through any local machine types. + echo $1 +- exit 0;; ++ exit ;; + + * ) + break ;; +@@ -117,10 +122,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* | storm-chaos* | os2-emx* | windows32-*) ++ 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 ] +@@ -143,10 +156,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) ++ -apple | -axis | -knuth | -cray | -microblaze*) + os= + basic_machine=$1 + ;; ++ -bluegene*) ++ os=-cnk ++ ;; + -sim | -cisco | -oki | -wec | -winbond) + os= + basic_machine=$1 +@@ -161,13 +177,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/'` +@@ -184,6 +204,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/'` +@@ -201,6 +225,12 @@ + -isc*) + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; ++ -lynx*178) ++ os=-lynxos178 ++ ;; ++ -lynx*5) ++ os=-lynxos5 ++ ;; + -lynx*) + os=-lynxos + ;; +@@ -225,43 +255,103 @@ + # 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] \ +- | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ ++ | 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 | avr32 \ ++ | be32 | be64 \ ++ | bfin \ + | c4x | clipper \ +- | d10v | d30v | dsp16xx \ +- | fr30 \ ++ | d10v | d30v | dlx | dsp16xx \ ++ | epiphany \ ++ | fido | fr30 | frv \ + | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ ++ | hexagon \ + | i370 | i860 | i960 | ia64 \ +- | m32r | m68000 | m68k | m88k | mcore \ +- | mips16 | mips64 | mips64el | mips64orion | mips64orionel \ +- | mips64vr4100 | mips64vr4100el | mips64vr4300 \ +- | mips64vr4300el | mips64vr5000 | mips64vr5000el \ +- | mipsbe | mipseb | mipsel | mipsle | mipstx39 | mipstx39el \ +- | mipsisa32 \ ++ | ip2k | iq2000 \ ++ | le32 | le64 \ ++ | lm32 \ ++ | m32c | m32r | m32rle | m68000 | m68k | m88k \ ++ | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ ++ | mips | mipsbe | mipseb | mipsel | mipsle \ ++ | mips16 \ ++ | mips64 | mips64el \ ++ | 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 \ ++ | mipstx39 | mipstx39el \ + | mn10200 | mn10300 \ ++ | moxie \ ++ | mt \ ++ | msp430 \ ++ | nds32 | nds32le | nds32be \ ++ | nios | nios2 \ + | ns16k | ns32k \ +- | openrisc \ ++ | open8 \ ++ | or32 \ + | pdp10 | pdp11 | pj | pjl \ +- | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ ++ | powerpc | powerpc64 | powerpc64le | powerpcle \ + | pyramid \ +- | s390 | s390x \ +- | sh | sh[34] | sh[34]eb | shbe | shle \ +- | sparc | sparc64 | sparclet | sparclite | sparcv9 | sparcv9b \ +- | stormy16 | strongarm \ +- | tahoe | thumb | tic80 | tron \ +- | v850 \ ++ | 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 | 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 \ +- | 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 +@@ -277,41 +367,81 @@ + # Recognize the basic CPU types with company name. + 580-* \ + | a29k-* \ ++ | aarch64-* | aarch64_be-* \ + | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ +- | alphapca5[67]-* | arc-* \ +- | arm-* | armbe-* | armle-* | armv*-* \ +- | bs2000-* \ +- | c[123]* | c30-* | [cjt]90-* | c54x-* \ +- | clipper-* | cray2-* | cydra-* \ +- | d10v-* | d30v-* \ ++ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ ++ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ ++ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ ++ | avr-* | avr32-* \ ++ | be32-* | be64-* \ ++ | bfin-* | bs2000-* \ ++ | c[123]* | c30-* | [cjt]90-* | c4x-* \ ++ | clipper-* | craynv-* | cydra-* \ ++ | d10v-* | d30v-* | dlx-* \ + | elxsi-* \ +- | f30[01]-* | f700-* | fr30-* | 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-* \ +- | m32r-* \ +- | m68000-* | m680[01234]0-* | m68360-* | m683?2-* | m68k-* \ +- | m88110-* | m88k-* | mcore-* \ +- | mips-* | mips16-* | mips64-* | mips64el-* | mips64orion-* \ +- | mips64orionel-* | mips64vr4100-* | mips64vr4100el-* \ +- | mips64vr4300-* | mips64vr4300el-* | mipsbe-* | mipseb-* \ +- | mipsle-* | mipsel-* | mipstx39-* | mipstx39el-* \ ++ | ip2k-* | iq2000-* \ ++ | le32-* | le64-* \ ++ | lm32-* \ ++ | m32c-* | m32r-* | m32rle-* \ ++ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ ++ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ ++ | microblaze-* | microblazeel-* \ ++ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ ++ | mips16-* \ ++ | mips64-* | mips64el-* \ ++ | 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-* \ ++ | mipstx39-* | mipstx39el-* \ ++ | mmix-* \ ++ | mt-* \ ++ | msp430-* \ ++ | nds32-* | nds32le-* | nds32be-* \ ++ | nios-* | nios2-* \ + | none-* | np1-* | ns16k-* | ns32k-* \ ++ | open8-* \ + | orion-* \ + | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ +- | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ ++ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ + | pyramid-* \ +- | romp-* | rs6000-* \ +- | s390-* | s390x-* \ +- | sh-* | sh[34]-* | sh[34]eb-* | shbe-* | shle-* \ +- | sparc-* | sparc64-* | sparc86x-* | sparclite-* \ +- | sparcv9-* | sparcv9b-* | stormy16-* | strongarm-* | sv1-* \ +- | t3e-* | tahoe-* | thumb-* | tic30-* | tic54x-* | tic80-* | tron-* \ +- | v850-* | vax-* \ ++ | 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-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ ++ | sparclite-* \ ++ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ ++ | tahoe-* \ ++ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ ++ | tile*-* \ ++ | tron-* \ ++ | ubicom32-* \ ++ | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ ++ | vax-* \ + | we32k-* \ +- | x86-* | x86_64-* | xmp-* | xps100-* | xscale-* \ ++ | 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. +@@ -329,6 +459,9 @@ + basic_machine=a29k-amd + os=-udi + ;; ++ abacus) ++ basic_machine=abacus-unknown ++ ;; + adobe68k) + basic_machine=m68010-adobe + os=-scout +@@ -343,6 +476,12 @@ + basic_machine=a29k-none + os=-bsd + ;; ++ amd64) ++ basic_machine=x86_64-pc ++ ;; ++ amd64-*) ++ basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; + amdahl) + basic_machine=580-amdahl + os=-sysv +@@ -366,6 +505,10 @@ + basic_machine=m68k-apollo + os=-bsd + ;; ++ aros) ++ basic_machine=i386-pc ++ os=-aros ++ ;; + aux) + basic_machine=m68k-apple + os=-aux +@@ -374,6 +517,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 +@@ -394,30 +566,45 @@ + basic_machine=c38-convex + os=-bsd + ;; +- cray | ymp) +- basic_machine=ymp-cray ++ cray | j90) ++ basic_machine=j90-cray + os=-unicos + ;; +- cray2) +- basic_machine=cray2-cray +- os=-unicos ++ craynv) ++ basic_machine=craynv-cray ++ os=-unicosmp + ;; +- [cjt]90) +- basic_machine=${basic_machine}-cray +- os=-unicos ++ cr16 | cr16-*) ++ basic_machine=cr16-unknown ++ os=-elf + ;; + crds | unos) + basic_machine=m68k-crds + ;; ++ crisv32 | crisv32-* | etraxfs*) ++ basic_machine=crisv32-axis ++ ;; + cris | cris-* | etrax*) + basic_machine=cris-axis + ;; ++ crx) ++ basic_machine=crx-unknown ++ os=-elf ++ ;; + da30 | da30-*) + basic_machine=m68k-da30 + ;; + decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn) + basic_machine=mips-dec + ;; ++ decsystem10* | dec10*) ++ basic_machine=pdp10-dec ++ os=-tops10 ++ ;; ++ decsystem20* | dec20*) ++ basic_machine=pdp10-dec ++ os=-tops20 ++ ;; + delta | 3300 | motorola-3300 | motorola-delta \ + | 3300-motorola | delta-motorola) + basic_machine=m68k-motorola +@@ -426,6 +613,14 @@ + basic_machine=m88k-motorola + os=-sysv3 + ;; ++ dicos) ++ basic_machine=i686-pc ++ os=-dicos ++ ;; ++ djgpp) ++ basic_machine=i586-pc ++ os=-msdosdjgpp ++ ;; + dpx20 | dpx20-*) + basic_machine=rs6000-bull + os=-bosx +@@ -537,7 +732,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 +@@ -576,6 +770,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 + ;; +@@ -587,10 +789,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 + ;; +@@ -598,36 +811,39 @@ + basic_machine=m68k-atari + os=-mint + ;; +- mipsel*-linux*) +- basic_machine=mipsel-unknown +- os=-linux-gnu +- ;; +- mips*-linux*) +- basic_machine=mips-unknown +- os=-linux-gnu +- ;; + mips3*-*) + basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` + ;; + mips3*) + basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown + ;; +- mmix*) +- basic_machine=mmix-knuth +- os=-mmixware +- ;; + monitor) + basic_machine=m68k-rom68k + os=-coff + ;; ++ morphos) ++ basic_machine=powerpc-unknown ++ os=-morphos ++ ;; + msdos) + 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 +@@ -692,6 +908,12 @@ + np1) + basic_machine=np1-gould + ;; ++ neo-tandem) ++ basic_machine=neo-tandem ++ ;; ++ nse-tandem) ++ basic_machine=nse-tandem ++ ;; + nsr-tandem) + basic_machine=nsr-tandem + ;; +@@ -699,6 +921,13 @@ + basic_machine=hppa1.1-oki + os=-proelf + ;; ++ openrisc | openrisc-*) ++ basic_machine=or32-unknown ++ ;; ++ os400) ++ basic_machine=powerpc-ibm ++ os=-os400 ++ ;; + OSE68000 | ose68000) + basic_machine=m68000-ericsson + os=-ose +@@ -715,55 +944,76 @@ + 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 + ;; + pbb) + basic_machine=m68k-tti + ;; +- pc532 | pc532-*) ++ pc532 | pc532-*) + basic_machine=ns32k-pc532 + ;; +- pentium | p5 | k5 | k6 | nexgen) ++ pc98) ++ basic_machine=i386-pc ++ ;; ++ pc98-*) ++ basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; ++ pentium | p5 | k5 | k6 | nexgen | viac3) + basic_machine=i586-pc + ;; +- pentiumpro | p6 | 6x86 | athlon) ++ pentiumpro | p6 | 6x86 | athlon | athlon_*) + basic_machine=i686-pc + ;; +- pentiumii | pentium2) ++ pentiumii | pentium2 | pentiumiii | pentium3) + basic_machine=i686-pc + ;; +- pentium-* | p5-* | k5-* | k6-* | nexgen-*) ++ pentium4) ++ basic_machine=i786-pc ++ ;; ++ pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) + basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + pentiumpro-* | p6-* | 6x86-* | athlon-*) + basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; +- pentiumii-* | pentium2-*) ++ pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) + basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; ++ pentium4-*) ++ basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; + pn) + basic_machine=pn-gould + ;; + power) basic_machine=power-ibm + ;; +- ppc) basic_machine=powerpc-unknown +- ;; +- ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ppc | ppcbe) basic_machine=powerpc-unknown ++ ;; ++ ppc-* | ppcbe-*) ++ basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + ppcle | powerpclittle | ppc-le | powerpc-little) + basic_machine=powerpcle-unknown +- ;; ++ ;; + ppcle-* | powerpclittle-*) + basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + ppc64) basic_machine=powerpc64-unknown +- ;; ++ ;; + ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + ppc64le | powerpc64little | ppc64-le | powerpc64-little) + basic_machine=powerpc64le-unknown +- ;; ++ ;; + ppc64le-* | powerpc64little-*) + basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; +@@ -774,6 +1024,10 @@ + basic_machine=i586-unknown + os=-pw32 + ;; ++ rdos) ++ basic_machine=i386-pc ++ os=-rdos ++ ;; + rom68k) + basic_machine=m68k-rom68k + os=-coff +@@ -784,10 +1038,30 @@ + rtpc | rtpc-*) + basic_machine=romp-ibm + ;; ++ s390 | s390-*) ++ basic_machine=s390-ibm ++ ;; ++ s390x | s390x-*) ++ basic_machine=s390x-ibm ++ ;; + sa29200) + basic_machine=a29k-amd + os=-udi + ;; ++ sb1) ++ basic_machine=mipsisa64sb1-unknown ++ ;; ++ sb1el) ++ basic_machine=mipsisa64sb1el-unknown ++ ;; ++ sde) ++ basic_machine=mipsisa32-sde ++ os=-elf ++ ;; ++ sei) ++ basic_machine=mips-sei ++ os=-seiux ++ ;; + sequent) + basic_machine=i386-sequent + ;; +@@ -795,7 +1069,13 @@ + basic_machine=sh-hitachi + os=-hms + ;; +- sparclite-wrs) ++ sh5el) ++ basic_machine=sh5le-unknown ++ ;; ++ sh64) ++ basic_machine=sh64-unknown ++ ;; ++ sparclite-wrs | simso-wrs) + basic_machine=sparclite-wrs + os=-vxworks + ;; +@@ -813,6 +1093,9 @@ + basic_machine=i860-stratus + os=-sysv4 + ;; ++ strongarm-* | thumb-*) ++ basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; + sun2) + basic_machine=m68000-sun + ;; +@@ -862,12 +1145,16 @@ + os=-dynix + ;; + t3e) +- basic_machine=t3e-cray ++ basic_machine=alphaev5-cray + os=-unicos + ;; +- tic54x | c54x*) +- basic_machine=tic54x-unknown +- os=-coff ++ t90) ++ basic_machine=t90-cray ++ os=-unicos ++ ;; ++ tile*) ++ basic_machine=$basic_machine-unknown ++ os=-linux-gnu + ;; + tx39) + basic_machine=mipstx39-unknown +@@ -875,9 +1162,17 @@ + tx39el) + basic_machine=mipstx39el-unknown + ;; ++ toad1) ++ basic_machine=pdp10-xkl ++ os=-tops20 ++ ;; + tower | tower-32) + basic_machine=m68k-ncr + ;; ++ tpf) ++ basic_machine=s390x-ibm ++ os=-tpf ++ ;; + udi29k) + basic_machine=a29k-amd + os=-udi +@@ -899,8 +1194,8 @@ + os=-vms + ;; + vpp*|vx|vx-*) +- basic_machine=f301-fujitsu +- ;; ++ basic_machine=f301-fujitsu ++ ;; + vxworks960) + basic_machine=i960-wrs + os=-vxworks +@@ -921,21 +1216,28 @@ + basic_machine=hppa1.1-winbond + os=-proelf + ;; +- windows32) +- basic_machine=i386-pc +- os=-windows32-msvcrt +- ;; +- xmp) +- basic_machine=xmp-cray +- os=-unicos ++ xbox) ++ basic_machine=i686-pc ++ os=-mingw32 + ;; +- xps | xps100) ++ 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 ++ ;; + z8k-*-coff) + basic_machine=z8k-unknown + os=-sim + ;; ++ z80-*-coff) ++ basic_machine=z80-unknown ++ os=-sim ++ ;; + none) + basic_machine=none-none + os=-none +@@ -952,16 +1254,12 @@ + op60c) + basic_machine=hppa1.1-oki + ;; +- mips) +- if [ x$os = x-linux-gnu ]; then +- basic_machine=mips-unknown +- else +- basic_machine=mips-mips +- fi +- ;; + romp) + basic_machine=romp-ibm + ;; ++ mmix) ++ basic_machine=mmix-knuth ++ ;; + rs6000) + basic_machine=rs6000-ibm + ;; +@@ -978,13 +1276,13 @@ + we32k) + basic_machine=we32k-att + ;; +- sh3 | sh4 | sh3eb | sh4eb) ++ sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele) + basic_machine=sh-unknown + ;; +- sparc | sparcv9 | sparcv9b) ++ sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) + basic_machine=sparc-sun + ;; +- cydra) ++ cydra) + basic_machine=cydra-cydrome + ;; + orion) +@@ -999,10 +1297,6 @@ + pmac | pmac-mpw) + basic_machine=powerpc-apple + ;; +- c4x*) +- basic_machine=c4x-none +- os=-coff +- ;; + *-unknown) + # Make sure to match an already-canonicalized machine name. + ;; +@@ -1029,9 +1323,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|'` + ;; +@@ -1052,23 +1349,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* \ + | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ +- | -aos* \ ++ | -aos* | -aros* \ + | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ + | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ +- | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \ +- | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ ++ | -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* | -uxpv* | -beos* | -mpeix* | -udk* \ +- | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \ ++ | -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*) ++ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ ++ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ ++ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ ++ | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*) + # Remember, each alternative MUST END IN *, to match a version number. + ;; + -qnx*) +@@ -1080,16 +1385,21 @@ + ;; + esac + ;; ++ -nto-qnx*) ++ ;; + -nto*) +- os=-nto-qnx ++ os=`echo $os | sed -e 's|nto|nto-qnx|'` + ;; + -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ +- | -windows* | -osx | -abug | -netware* | -os9* | -beos* \ ++ | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \ + | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) + ;; + -mac*) + os=`echo $os | sed -e 's|mac|macos|'` + ;; ++ -linux-dietlibc) ++ os=-linux-dietlibc ++ ;; + -linux*) + os=`echo $os | sed -e 's|linux|linux-gnu|'` + ;; +@@ -1102,6 +1412,9 @@ + -opened*) + os=-openedition + ;; ++ -os400*) ++ os=-os400 ++ ;; + -wince*) + os=-wince + ;; +@@ -1120,14 +1433,23 @@ + -acis*) + os=-aos + ;; ++ -atheos*) ++ os=-atheos ++ ;; ++ -syllable*) ++ os=-syllable ++ ;; + -386bsd) + os=-bsd + ;; + -ctix* | -uts*) + os=-sysv + ;; ++ -nova*) ++ os=-rtmk-nova ++ ;; + -ns2 ) +- os=-nextstep2 ++ os=-nextstep2 + ;; + -nsk*) + os=-nsk +@@ -1139,6 +1461,9 @@ + -sinix*) + os=-sysv4 + ;; ++ -tpf*) ++ os=-tpf ++ ;; + -triton*) + os=-sysv3 + ;; +@@ -1166,8 +1491,22 @@ + -xenix) + os=-xenix + ;; +- -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) +- os=-mint ++ -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) ++ os=-mint ++ ;; ++ -aros*) ++ os=-aros ++ ;; ++ -kaos*) ++ os=-kaos ++ ;; ++ -zvmoe) ++ os=-zvmoe ++ ;; ++ -dicos*) ++ os=-dicos ++ ;; ++ -nacl*) + ;; + -none) + ;; +@@ -1191,6 +1530,12 @@ + # system, and we'll never get to this point. + + case $basic_machine in ++ score-*) ++ os=-elf ++ ;; ++ spu-*) ++ os=-elf ++ ;; + *-acorn) + os=-riscix1.2 + ;; +@@ -1200,10 +1545,26 @@ + arm*-semi) + os=-aout + ;; ++ 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 + ;; +- pdp11-*) ++ pdp11-*) + os=-none + ;; + *-dec | vax-*) +@@ -1217,19 +1578,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 + ;; ++ or32-*) ++ os=-coff ++ ;; + *-tti) # must be before sparc entry or we get the wrong os. + os=-sysv3 + ;; +@@ -1239,9 +1603,15 @@ + *-be) + os=-beos + ;; ++ *-haiku) ++ os=-haiku ++ ;; + *-ibm) + os=-aix + ;; ++ *-knuth) ++ os=-mmixware ++ ;; + *-wec) + os=-proelf + ;; +@@ -1293,19 +1663,19 @@ + *-next) + os=-nextstep3 + ;; +- *-gould) ++ *-gould) + os=-sysv + ;; +- *-highlevel) ++ *-highlevel) + os=-bsd + ;; + *-encore) + os=-bsd + ;; +- *-sgi) ++ *-sgi) + os=-irix + ;; +- *-siemens) ++ *-siemens) + os=-sysv4 + ;; + *-masscomp) +@@ -1344,7 +1714,7 @@ + -sunos*) + vendor=sun + ;; +- -aix*) ++ -cnk*|-aix*) + vendor=ibm + ;; + -beos*) +@@ -1374,10 +1744,16 @@ + -mvs* | -opened*) + vendor=ibm + ;; ++ -os400*) ++ vendor=ibm ++ ;; + -ptx*) + vendor=sequent + ;; +- -vxsim* | -vxworks*) ++ -tpf*) ++ vendor=ibm ++ ;; ++ -vxsim* | -vxworks* | -windiss*) + vendor=wrs + ;; + -aux*) +@@ -1401,7 +1777,7 @@ + esac + + echo $basic_machine$os +-exit 0 ++exit + + # Local variables: + # eval: (add-hook 'write-file-hooks 'time-stamp) diff --git a/abe-1.1-settings.patch b/abe-1.1-settings.patch index ea5809f..bf06512 100644 --- a/abe-1.1-settings.patch +++ b/abe-1.1-settings.patch @@ -1,6 +1,5 @@ -diff -Naur --exclude '*.swp' abe-1.1/src/Menu.c abe-1.1.new/src/Menu.c ---- abe-1.1/src/Menu.c 2005-03-05 08:20:04.000000000 -0800 -+++ abe-1.1.new/src/Menu.c 2006-04-02 15:04:37.000000000 -0700 +--- src/Menu.c 2005-03-05 08:20:04.000000000 -0800 ++++ src/Menu.c 2006-04-02 15:04:37.000000000 -0700 @@ -116,7 +116,7 @@ if(n == SOUND_ENABLED || n == MUSIC_ENABLED) return sound_loaded; diff --git a/abe.spec b/abe.spec index bd4ca27..1a9bf77 100644 --- a/abe.spec +++ b/abe.spec @@ -1,16 +1,25 @@ Name: abe Version: 1.1 -Release: 17%{?dist} +Release: 18%{?dist} Summary: Scrolling, platform-jumping, ancient pyramid exploring game Group: Amusements/Games License: GPL+ URL: http://abe.sourceforge.net/ -Source0: http://downloads.sourceforge.net/abe/abe-%{version}.tar.gz +Source0: http://downloads.sourceforge.net/abe/%{name}-%{version}.tar.gz Source1: %{name}.png -Patch0: abe-1.1-settings.patch -Patch1: abe-1.1-doublefree.patch -Patch2: abe-1.1-format.patch +# Enable changing the video settings. Sent upstream 2 Apr 2006: +# https://sourceforge.net/tracker/?func=detail&aid=1463202&group_id=70141&atid=526743 +Patch0: %{name}-1.1-settings.patch +# Fix a double free() bug. Sent upstream 15 Mar 2011: +# https://sourceforge.net/tracker/?func=detail&aid=3214269&group_id=70141&atid=526745 +Patch1: %{name}-1.1-doublefree.patch +# Fix an incorrect printf format specifier. Sent upstram 15 Mar 2011: +# https://sourceforge.net/tracker/?func=detail&aid=3214270&group_id=70141&atid=526745 +Patch2: %{name}-1.1-format.patch +# Add support for aarch64. Sent upstream 25 Mar 2013: +# https://sourceforge.net/tracker/?func=detail&aid=3609029&group_id=70141&atid=526743 +Patch3: %{name}-1.1-aarch64.patch BuildRequires: SDL-devel >= 1.2.3, SDL_mixer-devel >= 1.2.3 BuildRequires: libXmu-devel libXi-devel @@ -22,10 +31,15 @@ vaguely in the style of similar games for the Commodore+4. %prep %setup -q -%patch0 -p1 +%patch0 %patch1 %patch2 +# Fix the FSF's address +sed 's/59 Temple Place, Suite 330, Boston, MA 02111-1307/51 Franklin Street, Suite 500, Boston, MA 02110-1335/' COPYING > COPYING.new +touch -r COPYING COPYING.new +mv -f COPYING.new COPYING + %build %configure --with-data-dir=%{_datadir}/%{name} sed -i "s/^CFLAGS =.*/CFLAGS = ${RPM_OPT_FLAGS} \$\(SDL_CFLAGS\)/" src/Makefile @@ -49,7 +63,6 @@ Exec=abe Icon=abe Terminal=false Type=Application -Encoding=UTF-8 Categories=Game;ArcadeGame; EOF @@ -71,6 +84,12 @@ fi %{_datadir}/pixmaps/%{name}.png %changelog +* Mon Mar 25 2013 Jerry James - 1.1-18 +- Add aarch64 support (bz 924964) +- Fix the FSF's address in COPYING +- Add comments on the upstream status of each patch +- Remove deprecated "Encoding" key from desktop file + * Sat Feb 09 2013 Rahul Sundaram - 1.1-17 - Remove vendor tag from desktop file. https://fedorahosted.org/fpc/ticket/247 From 207d86d4455553283daba30b4d6b4f13b2f540a9 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 2 Aug 2013 19:06:40 -0500 Subject: [PATCH 10/56] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- abe.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abe.spec b/abe.spec index 1a9bf77..07b207a 100644 --- a/abe.spec +++ b/abe.spec @@ -1,6 +1,6 @@ Name: abe Version: 1.1 -Release: 18%{?dist} +Release: 19%{?dist} Summary: Scrolling, platform-jumping, ancient pyramid exploring game Group: Amusements/Games @@ -84,6 +84,9 @@ fi %{_datadir}/pixmaps/%{name}.png %changelog +* Sat Aug 03 2013 Fedora Release Engineering - 1.1-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Mon Mar 25 2013 Jerry James - 1.1-18 - Add aarch64 support (bz 924964) - Fix the FSF's address in COPYING From a3eec486c1a56417ecd531473c9ad791bc221f96 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Fri, 8 Nov 2013 16:48:28 -0700 Subject: [PATCH 11/56] Add an AppData file. --- abe.appdata.xml | 25 +++++++++++++++++++++++++ abe.spec | 11 +++++++++-- 2 files changed, 34 insertions(+), 2 deletions(-) create mode 100644 abe.appdata.xml diff --git a/abe.appdata.xml b/abe.appdata.xml new file mode 100644 index 0000000..92c7da7 --- /dev/null +++ b/abe.appdata.xml @@ -0,0 +1,25 @@ + + + abe.desktop + CC0 + Abe's Amazing Adventure + +

+ Abe's Amazing Adventure is a scrolling, platform-jumping, key-collecting, + ancient pyramid exploring game, vaguely in the style of similar games for + the Commodore+4. +

+

+ The game is intended to show young people (I'm writing it for my son's + birthday) all the cool games they missed. +

+ + + http://abe.sourceforge.net/screen0-4-1.png + http://abe.sourceforge.net/screen2-4-2.png + + http://abe.sourceforge.net/ + + diff --git a/abe.spec b/abe.spec index 07b207a..9e7ef75 100644 --- a/abe.spec +++ b/abe.spec @@ -1,6 +1,6 @@ Name: abe Version: 1.1 -Release: 19%{?dist} +Release: 20%{?dist} Summary: Scrolling, platform-jumping, ancient pyramid exploring game Group: Amusements/Games @@ -8,6 +8,7 @@ License: GPL+ URL: http://abe.sourceforge.net/ Source0: http://downloads.sourceforge.net/abe/%{name}-%{version}.tar.gz Source1: %{name}.png +Source2: %{name}.appdata.xml # Enable changing the video settings. Sent upstream 2 Apr 2006: # https://sourceforge.net/tracker/?func=detail&aid=1463202&group_id=70141&atid=526743 Patch0: %{name}-1.1-settings.patch @@ -50,10 +51,12 @@ make DESTDIR=$RPM_BUILD_ROOT install # make install does not copy the game data files. mkdir -p $RPM_BUILD_ROOT/%{_datadir}/%{name} +mkdir -p $RPM_BUILD_ROOT/%{_datadir}/appdata/ mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications/ mkdir -p $RPM_BUILD_ROOT/%{_datadir}/pixmaps/ cp -p -r images maps sounds $RPM_BUILD_ROOT/%{_datadir}/%{name} install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_datadir}/pixmaps/ +install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_datadir}/appdata/ cat << EOF > %{name}.desktop [Desktop Entry] @@ -80,10 +83,14 @@ fi %doc COPYING README %{_bindir}/* %{_datadir}/%{name} +%{_datadir}/appdata/%{name}.appdata.xml %{_datadir}/applications/%{name}.desktop %{_datadir}/pixmaps/%{name}.png %changelog +* Fri Nov 8 2013 Jerry James - 1.1-20 +- Add an AppData file + * Sat Aug 03 2013 Fedora Release Engineering - 1.1-19 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild @@ -160,7 +167,7 @@ fi - fix build on gcc4 - patch to fix issues in #149362 -* Fri Apr 7 2005 Michael Schwendt +* Thu Apr 7 2005 Michael Schwendt - rebuilt * Wed Aug 13 2003 Panu Matilainen 0:1.0-0.fdr.3 From 9a8375a5567ba6642773756f0c63ffa233200594 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Wed, 20 Nov 2013 15:23:32 -0700 Subject: [PATCH 12/56] Add -format-security patch. --- abe-format-security.patch | 87 +++++++++++++++++++++++++++++++++++++++ abe.spec | 9 +++- 2 files changed, 95 insertions(+), 1 deletion(-) create mode 100644 abe-format-security.patch diff --git a/abe-format-security.patch b/abe-format-security.patch new file mode 100644 index 0000000..ad88b4b --- /dev/null +++ b/abe-format-security.patch @@ -0,0 +1,87 @@ +--- ./src/Game.c.orig 2005-03-05 09:20:04.000000000 -0700 ++++ ./src/Game.c 2013-11-20 12:30:00.000000000 -0700 +@@ -6,21 +6,14 @@ Game game; + + // path_sprintf should not be used by other .c files, as it does not fit for them. + static void +-path_sprintf(char *path, char *formatted_name, int version) ++path_sprintf(char *path, const char *name, int version) + { +- +- int len; +- +- printf("path_sprintf (%p, %s, %d)\n", path, formatted_name, version); +- +- strcpy(path, getSaveGameDir()); +- +- len = strlen(path); +- + if(1 == version) { +- sprintf(path + len, formatted_name); ++ printf("path_sprintf (%p, %s.dat, %d)\n", path, name, version); ++ sprintf(path, "%s%s.dat", getSaveGameDir(), name); + } else { +- sprintf(path + len, formatted_name, version); ++ printf("path_sprintf (%p, %s%d.dat, %d)\n", path, name, version, version); ++ sprintf(path, "%s%s%d.dat", getSaveGameDir(), name, version); + } + + } +@@ -30,14 +23,14 @@ deleteSavedGame() + { + char path[PATH_SIZE]; + // version 2 +- path_sprintf(path, "save%d.dat", GAME_VERSION); ++ path_sprintf(path, "save", GAME_VERSION); + remove(path); +- path_sprintf(path, "savedmap%d.dat", GAME_VERSION); ++ path_sprintf(path, "savedmap", GAME_VERSION); + remove(path); + // version 1 +- path_sprintf(path, "save.dat", 1); ++ path_sprintf(path, "save", 1); + remove(path); +- path_sprintf(path, "savedmap.dat", 1); ++ path_sprintf(path, "savedmap", 1); + remove(path); + } + +@@ -51,7 +44,7 @@ saveGame() + + mkshuae(); + +- path_sprintf(path, "save%d.dat", GAME_VERSION); ++ path_sprintf(path, "save", GAME_VERSION); + + if(!(fp = fopen(path, "wb"))) { + err = strerror(errno); +@@ -79,7 +72,7 @@ saveGame() + SDL_RWclose(rwop); + + // save the map +- path_sprintf(path, "savedmap%d.dat", GAME_VERSION); ++ path_sprintf(path, "savedmap", GAME_VERSION); + saveMapPath(path); + } + +@@ -96,7 +89,7 @@ loadGame() + version = (int) GAME_VERSION; + + // load the map +- path_sprintf(path, "savedmap%d.dat", GAME_VERSION); ++ path_sprintf(path, "savedmap", GAME_VERSION); + if(!loadMapPath(path, 0)) { + // if can't find saved map load static map + fprintf(stderr, +@@ -112,9 +105,9 @@ loadGame() + // try to find a saved game of any version + while(version > 0) { + if(version > 1) { +- path_sprintf(path, "save%d.dat", version); ++ path_sprintf(path, "save", version); + } else { // By Pedro: version==1 +- path_sprintf(path, "save.dat", version); ++ path_sprintf(path, "save", version); + } + fprintf(stderr, "Trying to load saved game: %s\n", path); + fflush(stderr); diff --git a/abe.spec b/abe.spec index 9e7ef75..2826d69 100644 --- a/abe.spec +++ b/abe.spec @@ -1,6 +1,6 @@ Name: abe Version: 1.1 -Release: 20%{?dist} +Release: 21%{?dist} Summary: Scrolling, platform-jumping, ancient pyramid exploring game Group: Amusements/Games @@ -21,6 +21,8 @@ Patch2: %{name}-1.1-format.patch # Add support for aarch64. Sent upstream 25 Mar 2013: # https://sourceforge.net/tracker/?func=detail&aid=3609029&group_id=70141&atid=526743 Patch3: %{name}-1.1-aarch64.patch +# Fix build failure with -Werror=format-security +Patch4: %{name}-1.1-format-security.patch BuildRequires: SDL-devel >= 1.2.3, SDL_mixer-devel >= 1.2.3 BuildRequires: libXmu-devel libXi-devel @@ -35,6 +37,8 @@ vaguely in the style of similar games for the Commodore+4. %patch0 %patch1 %patch2 +%patch3 +%patch4 # Fix the FSF's address sed 's/59 Temple Place, Suite 330, Boston, MA 02111-1307/51 Franklin Street, Suite 500, Boston, MA 02110-1335/' COPYING > COPYING.new @@ -88,6 +92,9 @@ fi %{_datadir}/pixmaps/%{name}.png %changelog +* Wed Nov 20 2013 Jerry James - 1.1-21 +- Add -format-security patch + * Fri Nov 8 2013 Jerry James - 1.1-20 - Add an AppData file From 5f532d93bea427fc7a142f3f2547f71365b187ec Mon Sep 17 00:00:00 2001 From: Jerry James Date: Wed, 20 Nov 2013 15:47:01 -0700 Subject: [PATCH 13/56] Fix name of the -format-security patch. --- abe-format-security.patch => abe-1.1-format-security.patch | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename abe-format-security.patch => abe-1.1-format-security.patch (100%) diff --git a/abe-format-security.patch b/abe-1.1-format-security.patch similarity index 100% rename from abe-format-security.patch rename to abe-1.1-format-security.patch From 04d8171d904b1e684ce0a8a5bd5158268aea872d Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 6 Jun 2014 18:57:31 -0500 Subject: [PATCH 14/56] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- abe.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abe.spec b/abe.spec index 2826d69..dea59e0 100644 --- a/abe.spec +++ b/abe.spec @@ -1,6 +1,6 @@ Name: abe Version: 1.1 -Release: 21%{?dist} +Release: 22%{?dist} Summary: Scrolling, platform-jumping, ancient pyramid exploring game Group: Amusements/Games @@ -92,6 +92,9 @@ fi %{_datadir}/pixmaps/%{name}.png %changelog +* Fri Jun 06 2014 Fedora Release Engineering - 1.1-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Wed Nov 20 2013 Jerry James - 1.1-21 - Add -format-security patch From ee6d5a74175342a61f0d19aa565a6d0d3ec7d7b3 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Mon, 21 Jul 2014 14:54:36 -0600 Subject: [PATCH 15/56] Add icons of varying sizes. --- .gitignore | 3 ++- abe.spec | 27 ++++++++++++++++++--------- sources | 1 + 3 files changed, 21 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 233a161..5b6a365 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -abe-1.1.tar.gz +/abe-1.1.tar.gz +/abe-icons.tar.xz diff --git a/abe.spec b/abe.spec index dea59e0..3e19d3a 100644 --- a/abe.spec +++ b/abe.spec @@ -1,13 +1,13 @@ Name: abe Version: 1.1 -Release: 22%{?dist} +Release: 23%{?dist} Summary: Scrolling, platform-jumping, ancient pyramid exploring game Group: Amusements/Games License: GPL+ URL: http://abe.sourceforge.net/ Source0: http://downloads.sourceforge.net/abe/%{name}-%{version}.tar.gz -Source1: %{name}.png +Source1: %{name}-icons.tar.xz Source2: %{name}.appdata.xml # Enable changing the video settings. Sent upstream 2 Apr 2006: # https://sourceforge.net/tracker/?func=detail&aid=1463202&group_id=70141&atid=526743 @@ -28,6 +28,10 @@ BuildRequires: SDL-devel >= 1.2.3, SDL_mixer-devel >= 1.2.3 BuildRequires: libXmu-devel libXi-devel BuildRequires: desktop-file-utils +Requires: hicolor-icon-theme + +%global icondir %{_datadir}/icons/hicolor + %description A scrolling, platform-jumping, key-collecting, ancient pyramid exploring game, vaguely in the style of similar games for the Commodore+4. @@ -57,9 +61,9 @@ make DESTDIR=$RPM_BUILD_ROOT install mkdir -p $RPM_BUILD_ROOT/%{_datadir}/%{name} mkdir -p $RPM_BUILD_ROOT/%{_datadir}/appdata/ mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications/ -mkdir -p $RPM_BUILD_ROOT/%{_datadir}/pixmaps/ +mkdir -p $RPM_BUILD_ROOT/%{icondir} cp -p -r images maps sounds $RPM_BUILD_ROOT/%{_datadir}/%{name} -install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_datadir}/pixmaps/ +tar xJf %{SOURCE1} -C $RPM_BUILD_ROOT%{icondir} install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_datadir}/appdata/ cat << EOF > %{name}.desktop @@ -76,12 +80,14 @@ EOF desktop-file-install --dir $RPM_BUILD_ROOT/%{_datadir}/applications/ %{name}.desktop %post -update-desktop-database %{_datadir}/applications &>/dev/null +update-desktop-database %{_datadir}/applications &>/dev/null || : +touch --no-create %{icondir} >&/dev/null ||: +gtk-update-icon-cache %{icondir} >&/dev/null ||: %postun -if [ $1 -eq 0 ]; then - update-desktop-database %{_datadir}/applications &>/dev/null -fi +update-desktop-database %{_datadir}/applications &>/dev/null +touch --no-create %{icondir} >&/dev/null ||: +gtk-update-icon-cache %{icondir} >&/dev/null ||: %files %doc COPYING README @@ -89,9 +95,12 @@ fi %{_datadir}/%{name} %{_datadir}/appdata/%{name}.appdata.xml %{_datadir}/applications/%{name}.desktop -%{_datadir}/pixmaps/%{name}.png +%{_datadir}/icons/hicolor/*/apps/%{name}.png %changelog +* Mon Jul 21 2014 Jerry James - 1.1-23 +- Add icons of varying sizes + * Fri Jun 06 2014 Fedora Release Engineering - 1.1-22 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild diff --git a/sources b/sources index 41b001f..9c013ca 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ 5537920e1746708e1a631d84d3500f5c abe-1.1.tar.gz +e41f81ca337cbfd7251d252232347f6b abe-icons.tar.xz From e1260a47015102b663e665bff3cca46ade8848e7 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Mon, 21 Jul 2014 14:55:10 -0600 Subject: [PATCH 16/56] Use the new %license macro. --- abe.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/abe.spec b/abe.spec index 3e19d3a..20d0cad 100644 --- a/abe.spec +++ b/abe.spec @@ -90,7 +90,8 @@ touch --no-create %{icondir} >&/dev/null ||: gtk-update-icon-cache %{icondir} >&/dev/null ||: %files -%doc COPYING README +%doc README +%license COPYING %{_bindir}/* %{_datadir}/%{name} %{_datadir}/appdata/%{name}.appdata.xml @@ -100,6 +101,7 @@ gtk-update-icon-cache %{icondir} >&/dev/null ||: %changelog * Mon Jul 21 2014 Jerry James - 1.1-23 - Add icons of varying sizes +- Use the new license macro * Fri Jun 06 2014 Fedora Release Engineering - 1.1-22 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From e09f18d26ae14933b6059d56375741d58aae4d88 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Wed, 13 Aug 2014 12:45:40 -0600 Subject: [PATCH 17/56] Drop unused abe.png file. Update -aarch64 patch with newer config.{guess,sub}. --- abe-1.1-aarch64.patch | 533 ++++++++++++++++++++++++------------------ abe.png | Bin 1989 -> 0 bytes abe.spec | 8 +- 3 files changed, 316 insertions(+), 225 deletions(-) delete mode 100644 abe.png diff --git a/abe-1.1-aarch64.patch b/abe-1.1-aarch64.patch index 5827a0d..480d876 100644 --- a/abe-1.1-aarch64.patch +++ b/abe-1.1-aarch64.patch @@ -1,20 +1,23 @@ ---- config.guess.orig 2005-03-05 10:20:39.000000000 -0600 -+++ config.guess 2013-03-03 00:30:18.802031358 -0600 -@@ -1,9 +1,10 @@ +--- config.guess.orig 2005-03-05 09:20:39.000000000 -0700 ++++ config.guess 2014-06-09 08:07:14.000000000 -0600 +@@ -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 -# Free Software Foundation, Inc. -+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, -+# 2011, 2012 Free Software Foundation, Inc. ++# Copyright 1992-2013 Free Software Foundation, Inc. -timestamp='2001-09-04' -+timestamp='2012-09-25' ++timestamp='2013-11-29' # 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 -@@ -16,23 +17,24 @@ +-# 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,23 +15,22 @@ # General Public License for more details. # # You should have received a copy of the GNU General Public License @@ -25,37 +28,40 @@ # 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. +- -# Written by Per Bothner . -# Please send patches to . -+ -+# Originally written by Per Bothner. Please send patches (context -+# diff format) to and include a 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"). # - # 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. +-# 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. ++# Originally written by Per Bothner. # -# The plan is that this can be called by configure scripts if you -# don't specify an explicit build system type. +# 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 ++# ++# Please send patches with a ChangeLog entry to config-patches@gnu.org. ++ me=`echo "$0" | sed -e 's,.*/,,'` -@@ -52,7 +54,8 @@ +@@ -52,8 +50,7 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 -+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 - Free Software Foundation, Inc. +-Free Software Foundation, Inc. ++Copyright 1992-2013 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO -@@ -65,11 +68,11 @@ + warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." +@@ -65,11 +62,11 @@ while test $# -gt 0 ; do case $1 in --time-stamp | --time* | -t ) @@ -70,7 +76,7 @@ -- ) # Stop option processing shift; break ;; - ) # Use stdin as input. -@@ -87,30 +90,42 @@ +@@ -87,30 +84,42 @@ exit 1 fi @@ -123,7 +129,32 @@ # This is needed to find uname on a Pyramid OSx when run in the BSD universe. # (ghazi@noc.rutgers.edu 1994-08-24) -@@ -127,32 +142,34 @@ +@@ -123,36 +132,59 @@ + 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:*:*) @@ -174,7 +205,7 @@ then # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). # Return netbsd for either. FIX? -@@ -162,124 +179,139 @@ +@@ -162,124 +194,139 @@ fi ;; *) @@ -402,7 +433,7 @@ 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 -@@ -287,25 +319,51 @@ +@@ -287,25 +334,51 @@ else echo pyramid-pyramid-bsd fi @@ -462,7 +493,7 @@ sun4*:SunOS:*:*) case "`/usr/bin/arch -k`" in Series*|S4*) -@@ -314,12 +372,12 @@ +@@ -314,12 +387,12 @@ esac # Japanese Language versions have a version number like `4.1.3-JL'. echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` @@ -478,7 +509,7 @@ test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 case "`/bin/arch`" in sun3) -@@ -329,16 +387,10 @@ +@@ -329,16 +402,10 @@ echo sparc-sun-sunos${UNAME_RELEASE} ;; esac @@ -497,7 +528,7 @@ # 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 -@@ -348,50 +400,41 @@ +@@ -348,50 +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:*:*) @@ -567,7 +598,7 @@ mips:*:*:UMIPS | mips:*:*:RISCos) eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c -@@ -415,30 +458,36 @@ +@@ -415,30 +473,36 @@ exit (-1); } EOF @@ -616,7 +647,7 @@ if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] then if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ -@@ -451,29 +500,29 @@ +@@ -451,29 +515,29 @@ else echo i586-dg-dgux${UNAME_RELEASE} fi @@ -655,7 +686,7 @@ ia64:AIX:*:*) if [ -x /usr/bin/oslevel ] ; then IBM_REV=`/usr/bin/oslevel` -@@ -481,7 +530,7 @@ +@@ -481,7 +545,7 @@ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} fi echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} @@ -664,7 +695,7 @@ *:AIX:2:3) if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then eval $set_cc_for_build -@@ -496,17 +545,20 @@ +@@ -496,17 +560,20 @@ exit(0); } EOF @@ -691,7 +722,7 @@ if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then IBM_ARCH=rs6000 else -@@ -518,96 +570,114 @@ +@@ -518,96 +585,114 @@ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} fi echo ${IBM_ARCH}-ibm-aix${IBM_REV} @@ -750,18 +781,44 @@ - if [ "${HP_ARCH}" = "" ]; then - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c -- ++ 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" ;; ++ '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 ++ esac ;; ++ esac ++ fi ++ if [ "${HP_ARCH}" = "" ]; then ++ eval $set_cc_for_build ++ 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); -- ++ 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; @@ -781,35 +838,6 @@ - } - exit (0); - } -+ 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" ;; -+ '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 -+ esac ;; -+ esac -+ fi -+ if [ "${HP_ARCH}" = "" ]; then -+ eval $set_cc_for_build -+ sed 's/^ //' << EOF >$dummy.c -+ -+ #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; @@ -870,7 +898,7 @@ 3050*:HI-UX:*:*) eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c -@@ -635,158 +705,176 @@ +@@ -635,158 +720,176 @@ exit (0); } EOF @@ -1083,30 +1111,26 @@ - exit 0 ;; + exit ;; *:GNU:*:*) -+ # the GNU system - echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` +- echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` - exit 0 ;; ++ # the GNU system ++ 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 ++ 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 ;; - arm*:Linux:*:*) -+ exit ;; -+ aarch64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu +- echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; - ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux - exit 0 ;; - m68*:Linux:*:*) -+ exit ;; -+ aarch64_be:Linux:*:*) -+ UNAME_MACHINE=aarch64_be - echo ${UNAME_MACHINE}-unknown-linux-gnu +- echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; - mips:Linux:*:*) - case `sed -n '/^byte/s/^.*: \(.*\) endian/\1/p' < /proc/cpuinfo` in @@ -1120,72 +1144,76 @@ - ppc64:Linux:*:*) - echo powerpc64-unknown-linux-gnu - 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 ;; -@@ -796,11 +884,90 @@ +@@ -796,104 +899,166 @@ 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 ;; + esac + objdump --private-headers /bin/sh | grep -q ld.so.1 - if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} -- exit 0 ;; ++ 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:*:*) + 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-gnu ++ 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-gnueabi ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi + else -+ echo ${UNAME_MACHINE}-unknown-linux-gnueabihf ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf + fi + fi + exit ;; + avr32*:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + cris:Linux:*:*) -+ echo ${UNAME_MACHINE}-axis-linux-gnu ++ echo ${UNAME_MACHINE}-axis-linux-${LIBC} + exit ;; + crisv32:Linux:*:*) -+ echo ${UNAME_MACHINE}-axis-linux-gnu ++ echo ${UNAME_MACHINE}-axis-linux-${LIBC} + exit ;; + frv:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + hexagon:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + i*86:Linux:*:*) -+ LIBC=gnu -+ eval $set_cc_for_build -+ sed 's/^ //' << EOF >$dummy.c -+ #ifdef __dietlibc__ -+ LIBC=dietlibc -+ #endif -+EOF -+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` -+ echo "${UNAME_MACHINE}-pc-linux-${LIBC}" ++ echo ${UNAME_MACHINE}-pc-linux-${LIBC} + exit ;; + ia64:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + m32r*:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + m68*:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + mips:Linux:*:* | mips64:Linux:*:*) + eval $set_cc_for_build @@ -1204,23 +1232,29 @@ + #endif +EOF + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` -+ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ++ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } + ;; ++ or1k:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} ++ exit ;; + or32:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + padre:Linux:*:*) -+ echo sparc-unknown-linux-gnu ++ echo sparc-unknown-linux-${LIBC} + exit ;; + parisc64:Linux:*:* | hppa64:Linux:*:*) -+ echo hppa64-unknown-linux-gnu ++ 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 -@@ -808,92 +975,71 @@ - PA8*) echo hppa2.0-unknown-linux-gnu ;; - *) echo hppa-unknown-linux-gnu ;; +- 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:*:*) @@ -1228,31 +1262,40 @@ - exit 0 ;; + exit ;; + ppc64:Linux:*:*) -+ echo powerpc64-unknown-linux-gnu ++ echo powerpc64-unknown-linux-${LIBC} + exit ;; + ppc:Linux:*:*) -+ echo powerpc-unknown-linux-gnu ++ echo powerpc-unknown-linux-${LIBC} ++ exit ;; ++ ppc64le:Linux:*:*) ++ echo powerpc64le-unknown-linux-${LIBC} ++ exit ;; ++ ppcle:Linux:*:*) ++ echo powerpcle-unknown-linux-${LIBC} + exit ;; s390:Linux:*:* | s390x:Linux:*:*) - echo ${UNAME_MACHINE}-ibm-linux +- echo ${UNAME_MACHINE}-ibm-linux - exit 0 ;; ++ echo ${UNAME_MACHINE}-ibm-linux-${LIBC} + exit ;; + sh64*:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; sh*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu +- 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 +- echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + tile*:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + vax:Linux:*:*) -+ echo ${UNAME_MACHINE}-dec-linux-gnu ++ echo ${UNAME_MACHINE}-dec-linux-${LIBC} + exit ;; x86_64:Linux:*:*) - echo x86_64-unknown-linux-gnu @@ -1313,10 +1356,10 @@ - rm -f $dummy.c $dummy - test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 - ;; -+ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + xtensa*:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. @@ -1361,7 +1404,7 @@ 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 -@@ -901,99 +1047,113 @@ +@@ -901,99 +1066,113 @@ else echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} fi @@ -1514,7 +1557,7 @@ *:SINIX-*:*:*) if uname -p 2>/dev/null >/dev/null ; then UNAME_MACHINE=`(uname -p) 2>/dev/null` -@@ -1001,82 +1161,126 @@ +@@ -1001,82 +1180,138 @@ else echo ns32k-sni-sysv fi @@ -1616,19 +1659,31 @@ - echo `uname -p`-apple-darwin${UNAME_RELEASE} - exit 0 ;; + UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown -+ case $UNAME_PROCESSOR in -+ i386) -+ eval $set_cc_for_build -+ 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 -+ UNAME_PROCESSOR="x86_64" -+ fi -+ fi ;; -+ unknown) UNAME_PROCESSOR=powerpc ;; -+ esac ++ eval $set_cc_for_build ++ if test "$UNAME_PROCESSOR" = unknown ; then ++ UNAME_PROCESSOR=powerpc ++ fi ++ if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then ++ 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 ++ elif test "$UNAME_PROCESSOR" = i386 ; then ++ # Avoid executing cc on OS X 10.9, as it ships with a stub ++ # that puts up a graphical alert prompting to install ++ # developer tools. Any system running Mac OS X 10.7 or ++ # later (Darwin 11 and later) is required to have a 64-bit ++ # processor. This is not true of the ARM version of Darwin ++ # that Apple uses in portable devices. ++ UNAME_PROCESSOR=x86_64 ++ fi + echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} + exit ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) @@ -1672,7 +1727,7 @@ *:Plan9:*:*) # "uname -m" is not consistent, so use $cputype instead. 386 # is converted to i386 for consistency with other x86 -@@ -1087,41 +1291,55 @@ +@@ -1087,41 +1322,55 @@ UNAME_MACHINE="$cputype" fi echo ${UNAME_MACHINE}-unknown-plan9 @@ -1749,7 +1804,7 @@ eval $set_cc_for_build cat >$dummy.c < printf ("m68k-sony-newsos%s\n", #ifdef NEWSOS4 @@ -1770,7 +1825,7 @@ #endif #if defined (hp300) && !defined (hpux) -@@ -1237,12 +1455,12 @@ +@@ -1237,12 +1486,12 @@ } EOF @@ -1786,7 +1841,7 @@ # Convex versions that predate uname can use getsysinfo(1) -@@ -1251,22 +1469,22 @@ +@@ -1251,22 +1500,22 @@ case `getsysinfo -f cpu_type` in c1*) echo c1-convex-bsd @@ -1814,7 +1869,7 @@ esac fi -@@ -1277,7 +1495,9 @@ +@@ -1277,7 +1526,9 @@ the operating system you are using. It is advised that you download the most up to date version of the config scripts from @@ -1825,24 +1880,38 @@ If the version you run ($0) is already up to date, please send the following data and any information you think might be ---- config.sub.orig 2005-03-05 10:20:39.000000000 -0600 -+++ config.sub 2013-03-03 00:30:18.841026879 -0600 -@@ -1,9 +1,10 @@ +--- config.sub.orig 2005-03-05 09:20:39.000000000 -0700 ++++ config.sub 2014-06-09 08:07:14.000000000 -0600 +@@ -1,41 +1,40 @@ #! /bin/sh # Configuration validation subroutine script. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 -# Free Software Foundation, Inc. -+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, -+# 2011, 2012 Free Software Foundation, Inc. ++# Copyright 1992-2013 Free Software Foundation, Inc. -timestamp='2001-09-07' -+timestamp='2012-10-10' ++timestamp='2013-10-01' - # This file is (in principle) common to ALL GNU software. - # The presence of a machine in this file suggests that SOME GNU software -@@ -20,22 +21,25 @@ - # GNU General Public License for more details. +-# 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 @@ -1854,12 +1923,14 @@ # 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. ++# 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 . + -+# Please send patches to . Submit a context -+# diff and a properly formatted GNU 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. @@ -1872,17 +1943,17 @@ # 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. -@@ -69,7 +73,8 @@ +@@ -69,8 +68,7 @@ version="\ GNU config.sub ($timestamp) -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 -+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 - Free Software Foundation, Inc. +-Free Software Foundation, Inc. ++Copyright 1992-2013 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO -@@ -82,11 +87,11 @@ + warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." +@@ -82,11 +80,11 @@ while test $# -gt 0 ; do case $1 in --time-stamp | --time* | -t ) @@ -1897,7 +1968,7 @@ -- ) # Stop option processing shift; break ;; - ) # Use stdin as input. -@@ -98,7 +103,7 @@ +@@ -98,7 +96,7 @@ *local*) # First pass through any local machine types. echo $1 @@ -1906,7 +1977,7 @@ * ) break ;; -@@ -117,10 +122,18 @@ +@@ -117,10 +115,18 @@ # Here we must recognize all the valid KERNEL-OS combinations. maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in @@ -1926,7 +1997,7 @@ *) basic_machine=`echo $1 | sed 's/-[^-]*$//'` if [ $basic_machine != $1 ] -@@ -143,10 +156,13 @@ +@@ -143,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 | \ @@ -1941,7 +2012,7 @@ -sim | -cisco | -oki | -wec | -winbond) os= basic_machine=$1 -@@ -161,13 +177,17 @@ +@@ -161,13 +170,17 @@ os=-chorusos basic_machine=$1 ;; @@ -1962,7 +2033,7 @@ -sco5) os=-sco3.2v5 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` -@@ -184,6 +204,10 @@ +@@ -184,6 +197,10 @@ # Don't forget version if it is 3.2v4 or newer. basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; @@ -1973,7 +2044,7 @@ -sco*) os=-sco3.2v2 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` -@@ -201,6 +225,12 @@ +@@ -201,6 +218,12 @@ -isc*) basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; @@ -1986,21 +2057,24 @@ -lynx*) os=-lynxos ;; -@@ -225,43 +255,103 @@ +@@ -225,43 +248,107 @@ # 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] \ - | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ -+ | 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 | avr32 \ -+ | be32 | be64 \ -+ | bfin \ - | c4x | clipper \ +- | c4x | clipper \ - | d10v | d30v | dsp16xx \ - | fr30 \ ++ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ ++ | am33_2.0 \ ++ | arc | arceb \ ++ | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ ++ | avr | avr32 \ ++ | be32 | be64 \ ++ | bfin \ ++ | c4x | c8051 | clipper \ + | d10v | d30v | dlx | dsp16xx \ + | epiphany \ + | fido | fr30 | frv \ @@ -2014,6 +2088,7 @@ - | mipsbe | mipseb | mipsel | mipsle | mipstx39 | mipstx39el \ - | mipsisa32 \ + | ip2k | iq2000 \ ++ | k1om \ + | le32 | le64 \ + | lm32 \ + | m32c | m32r | m32rle | m68000 | m68k | m88k \ @@ -2035,17 +2110,18 @@ + | mipsisa64r2 | mipsisa64r2el \ + | mipsisa64sb1 | mipsisa64sb1el \ + | mipsisa64sr71k | mipsisa64sr71kel \ ++ | mipsr5900 | mipsr5900el \ + | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ + | moxie \ + | mt \ + | msp430 \ + | nds32 | nds32le | nds32be \ -+ | nios | nios2 \ ++ | nios | nios2 | nios2eb | nios2el \ | ns16k | ns32k \ - | openrisc \ + | open8 \ -+ | or32 \ ++ | or1k | or32 \ | pdp10 | pdp11 | pj | pjl \ - | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ + | powerpc | powerpc64 | powerpc64le | powerpcle \ @@ -2084,7 +2160,7 @@ + c6x) + basic_machine=tic6x-unknown + ;; -+ m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) ++ m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip) basic_machine=$basic_machine-unknown os=-none ;; @@ -2111,7 +2187,7 @@ # We use `pc' rather than `unknown' # because (1) that's what they normally are, and -@@ -277,41 +367,81 @@ +@@ -277,41 +364,83 @@ # Recognize the basic CPU types with company name. 580-* \ | a29k-* \ @@ -2124,13 +2200,13 @@ - | clipper-* | cray2-* | cydra-* \ - | d10v-* | d30v-* \ + | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ -+ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ ++ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ + | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ + | avr-* | avr32-* \ + | be32-* | be64-* \ + | bfin-* | bs2000-* \ + | c[123]* | c30-* | [cjt]90-* | c4x-* \ -+ | clipper-* | craynv-* | cydra-* \ ++ | c8051-* | clipper-* | craynv-* | cydra-* \ + | d10v-* | d30v-* | dlx-* \ | elxsi-* \ - | f30[01]-* | f700-* | fr30-* | fx80-* \ @@ -2147,6 +2223,7 @@ - | mips64vr4300-* | mips64vr4300el-* | mipsbe-* | mipseb-* \ - | mipsle-* | mipsel-* | mipstx39-* | mipstx39el-* \ + | ip2k-* | iq2000-* \ ++ | k1om-* \ + | le32-* | le64-* \ + | lm32-* \ + | m32c-* | m32r-* | m32rle-* \ @@ -2170,12 +2247,13 @@ + | mipsisa64r2-* | mipsisa64r2el-* \ + | mipsisa64sb1-* | mipsisa64sb1el-* \ + | mipsisa64sr71k-* | mipsisa64sr71kel-* \ ++ | mipsr5900-* | mipsr5900el-* \ + | mipstx39-* | mipstx39el-* \ + | mmix-* \ + | mt-* \ + | msp430-* \ + | nds32-* | nds32le-* | nds32be-* \ -+ | nios-* | nios2-* \ ++ | nios-* | nios2-* | nios2eb-* | nios2el-* \ | none-* | np1-* | ns16k-* | ns32k-* \ + | open8-* \ | orion-* \ @@ -2217,7 +2295,7 @@ ;; # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. -@@ -329,6 +459,9 @@ +@@ -329,6 +458,9 @@ basic_machine=a29k-amd os=-udi ;; @@ -2227,7 +2305,7 @@ adobe68k) basic_machine=m68010-adobe os=-scout -@@ -343,6 +476,12 @@ +@@ -343,6 +475,12 @@ basic_machine=a29k-none os=-bsd ;; @@ -2240,7 +2318,7 @@ amdahl) basic_machine=580-amdahl os=-sysv -@@ -366,6 +505,10 @@ +@@ -366,6 +504,10 @@ basic_machine=m68k-apollo os=-bsd ;; @@ -2251,7 +2329,7 @@ aux) basic_machine=m68k-apple os=-aux -@@ -374,6 +517,35 @@ +@@ -374,6 +516,35 @@ basic_machine=ns32k-sequent os=-dynix ;; @@ -2287,7 +2365,7 @@ convex-c1) basic_machine=c1-convex os=-bsd -@@ -394,30 +566,45 @@ +@@ -394,30 +565,45 @@ basic_machine=c38-convex os=-bsd ;; @@ -2341,7 +2419,7 @@ delta | 3300 | motorola-3300 | motorola-delta \ | 3300-motorola | delta-motorola) basic_machine=m68k-motorola -@@ -426,6 +613,14 @@ +@@ -426,6 +612,14 @@ basic_machine=m88k-motorola os=-sysv3 ;; @@ -2356,7 +2434,7 @@ dpx20 | dpx20-*) basic_machine=rs6000-bull os=-bosx -@@ -537,7 +732,6 @@ +@@ -537,7 +731,6 @@ i370-ibm* | ibm*) basic_machine=i370-ibm ;; @@ -2364,7 +2442,7 @@ i*86v32) basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` os=-sysv32 -@@ -576,6 +770,14 @@ +@@ -576,6 +769,14 @@ basic_machine=m68k-isi os=-sysv ;; @@ -2379,7 +2457,7 @@ m88k-omron*) basic_machine=m88k-omron ;; -@@ -587,10 +789,21 @@ +@@ -587,10 +788,21 @@ basic_machine=ns32k-utek os=-sysv ;; @@ -2391,7 +2469,8 @@ + os=-mingw64 + ;; mingw32) - basic_machine=i386-pc +- basic_machine=i386-pc ++ basic_machine=i686-pc os=-mingw32 ;; + mingw32ce) @@ -2401,7 +2480,7 @@ miniframe) basic_machine=m68000-convergent ;; -@@ -598,36 +811,39 @@ +@@ -598,36 +810,39 @@ basic_machine=m68k-atari os=-mint ;; @@ -2439,7 +2518,7 @@ + basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` + ;; + msys) -+ basic_machine=i386-pc ++ basic_machine=i686-pc + os=-msys + ;; mvs) @@ -2453,7 +2532,7 @@ ncr3000) basic_machine=i486-ncr os=-sysv4 -@@ -692,6 +908,12 @@ +@@ -692,6 +907,12 @@ np1) basic_machine=np1-gould ;; @@ -2466,7 +2545,7 @@ nsr-tandem) basic_machine=nsr-tandem ;; -@@ -699,6 +921,13 @@ +@@ -699,6 +920,13 @@ basic_machine=hppa1.1-oki os=-proelf ;; @@ -2480,7 +2559,7 @@ OSE68000 | ose68000) basic_machine=m68000-ericsson os=-ose -@@ -715,55 +944,76 @@ +@@ -715,55 +943,76 @@ basic_machine=i860-intel os=-osf ;; @@ -2559,8 +2638,9 @@ ;; ppc64) basic_machine=powerpc64-unknown - ;; +- ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; - ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ppc64-* | ppc64p7-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ppc64le | powerpc64little | ppc64-le | powerpc64-little) basic_machine=powerpc64le-unknown @@ -2569,18 +2649,22 @@ ppc64le-* | powerpc64little-*) basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'` ;; -@@ -774,6 +1024,10 @@ +@@ -774,6 +1023,14 @@ basic_machine=i586-unknown os=-pw32 ;; -+ rdos) ++ rdos | rdos64) ++ basic_machine=x86_64-pc ++ os=-rdos ++ ;; ++ rdos32) + basic_machine=i386-pc + os=-rdos + ;; rom68k) basic_machine=m68k-rom68k os=-coff -@@ -784,10 +1038,30 @@ +@@ -784,10 +1041,30 @@ rtpc | rtpc-*) basic_machine=romp-ibm ;; @@ -2611,7 +2695,7 @@ sequent) basic_machine=i386-sequent ;; -@@ -795,7 +1069,13 @@ +@@ -795,7 +1072,13 @@ basic_machine=sh-hitachi os=-hms ;; @@ -2626,7 +2710,7 @@ basic_machine=sparclite-wrs os=-vxworks ;; -@@ -813,6 +1093,9 @@ +@@ -813,6 +1096,9 @@ basic_machine=i860-stratus os=-sysv4 ;; @@ -2636,7 +2720,7 @@ sun2) basic_machine=m68000-sun ;; -@@ -862,12 +1145,16 @@ +@@ -862,12 +1148,16 @@ os=-dynix ;; t3e) @@ -2657,7 +2741,7 @@ ;; tx39) basic_machine=mipstx39-unknown -@@ -875,9 +1162,17 @@ +@@ -875,9 +1165,17 @@ tx39el) basic_machine=mipstx39el-unknown ;; @@ -2675,7 +2759,7 @@ udi29k) basic_machine=a29k-amd os=-udi -@@ -899,8 +1194,8 @@ +@@ -899,8 +1197,8 @@ os=-vms ;; vpp*|vx|vx-*) @@ -2686,7 +2770,7 @@ vxworks960) basic_machine=i960-wrs os=-vxworks -@@ -921,21 +1216,28 @@ +@@ -921,21 +1219,28 @@ basic_machine=hppa1.1-winbond os=-proelf ;; @@ -2723,7 +2807,7 @@ none) basic_machine=none-none os=-none -@@ -952,16 +1254,12 @@ +@@ -952,16 +1257,12 @@ op60c) basic_machine=hppa1.1-oki ;; @@ -2743,7 +2827,7 @@ rs6000) basic_machine=rs6000-ibm ;; -@@ -978,13 +1276,13 @@ +@@ -978,13 +1279,13 @@ we32k) basic_machine=we32k-att ;; @@ -2760,7 +2844,7 @@ basic_machine=cydra-cydrome ;; orion) -@@ -999,10 +1297,6 @@ +@@ -999,10 +1300,6 @@ pmac | pmac-mpw) basic_machine=powerpc-apple ;; @@ -2771,7 +2855,7 @@ *-unknown) # Make sure to match an already-canonicalized machine name. ;; -@@ -1029,9 +1323,12 @@ +@@ -1029,9 +1326,12 @@ if [ x"$os" != x"" ] then case $os in @@ -2786,7 +2870,7 @@ -solaris1 | -solaris1.*) os=`echo $os | sed -e 's|solaris1|sunos4|'` ;; -@@ -1052,23 +1349,31 @@ +@@ -1052,23 +1352,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* \ @@ -2794,7 +2878,7 @@ - | -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* \ ++ | -sym* | -kopensolaris* | -plan9* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ - | -aos* \ + | -aos* | -aros* \ @@ -2828,7 +2912,7 @@ # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) -@@ -1080,16 +1385,21 @@ +@@ -1080,16 +1388,21 @@ ;; esac ;; @@ -2852,7 +2936,7 @@ -linux*) os=`echo $os | sed -e 's|linux|linux-gnu|'` ;; -@@ -1102,6 +1412,9 @@ +@@ -1102,6 +1415,9 @@ -opened*) os=-openedition ;; @@ -2862,7 +2946,7 @@ -wince*) os=-wince ;; -@@ -1120,14 +1433,23 @@ +@@ -1120,14 +1436,23 @@ -acis*) os=-aos ;; @@ -2887,7 +2971,7 @@ ;; -nsk*) os=-nsk -@@ -1139,6 +1461,9 @@ +@@ -1139,6 +1464,9 @@ -sinix*) os=-sysv4 ;; @@ -2897,7 +2981,7 @@ -triton*) os=-sysv3 ;; -@@ -1166,8 +1491,22 @@ +@@ -1166,8 +1494,19 @@ -xenix) os=-xenix ;; @@ -2909,9 +2993,6 @@ + -aros*) + os=-aros + ;; -+ -kaos*) -+ os=-kaos -+ ;; + -zvmoe) + os=-zvmoe + ;; @@ -2935,13 +3016,16 @@ *-acorn) os=-riscix1.2 ;; -@@ -1200,10 +1545,26 @@ +@@ -1200,10 +1545,29 @@ arm*-semi) os=-aout ;; + c4x-* | tic4x-*) + os=-coff + ;; ++ c8051-*) ++ os=-elf ++ ;; + hexagon-*) + os=-elf + ;; @@ -2963,7 +3047,7 @@ os=-none ;; *-dec | vax-*) -@@ -1217,19 +1578,22 @@ +@@ -1217,19 +1581,25 @@ ;; m68000-sun) os=-sunos3 @@ -2983,13 +3067,16 @@ mips*-*) os=-elf ;; ++ or1k-*) ++ os=-elf ++ ;; + or32-*) + os=-coff + ;; *-tti) # must be before sparc entry or we get the wrong os. os=-sysv3 ;; -@@ -1239,9 +1603,15 @@ +@@ -1239,9 +1609,15 @@ *-be) os=-beos ;; @@ -3005,7 +3092,7 @@ *-wec) os=-proelf ;; -@@ -1293,19 +1663,19 @@ +@@ -1293,19 +1669,19 @@ *-next) os=-nextstep3 ;; @@ -3029,7 +3116,7 @@ os=-sysv4 ;; *-masscomp) -@@ -1344,7 +1714,7 @@ +@@ -1344,7 +1720,7 @@ -sunos*) vendor=sun ;; @@ -3038,7 +3125,7 @@ vendor=ibm ;; -beos*) -@@ -1374,10 +1744,16 @@ +@@ -1374,10 +1750,16 @@ -mvs* | -opened*) vendor=ibm ;; @@ -3056,7 +3143,7 @@ vendor=wrs ;; -aux*) -@@ -1401,7 +1777,7 @@ +@@ -1401,7 +1783,7 @@ esac echo $basic_machine$os diff --git a/abe.png b/abe.png deleted file mode 100644 index 41e380c7ef907da12012f5368a2173941a5c1295..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1989 zcmV;$2RitPP)MXt3{3Q-wm#*Ca};Szy6Uv2Pr zE%dq&5T#+UHKH{kZ|=DQ+`hUxW$l+jWX2ZCBAIvDyxB1V6rd4<060_&*&~90VgyEu zejv#1h_DVY&+4qtzZby9CHWYHfkJ=*4GwVLK?JC)Su22%RwV$A02PT(^m8WO-G&6f zkqJnP2oi!5?pZJ>D(F3#@Exg$WiMXBsN2I8B^4G%stcnlbI>7pt?qs=`qnhP+#Gyq z*Q&`25$_tSJWzLDRLP*QEK7}m#GJ+C9%|TePe$P_DU}&HGdLS;yi|E_Q+j!=hXt%u z!4m2;T0cW%XlBT*&-m+Sx|eG8KU5izfH>|{c%8|AF`!<^D^n?lqLImkP&{3cojJ8K zTLEt&N(4^?Kl*F!;coG0-WQLWiMBZ~(YyAF`SF49rU)hXd*bL#(HC|M9-Hqx{^wc~ z{l0OYTJLeJg=>|}_wln90-C`;PQakGS4YvF${-eW81Gwf59o z?up~&aI5~{jC!<}JvY_}3BP%=b?~a_`#1RST!0^*>kW+#Ju$_#OJ?7srFJQ#)tjIS zuOg-FV}XoxEvg4zZv5;O`0}ZAWV!L*ac4n&;Vi9_^1$s)>X!Ewc70vDb}v{Pt56q1 z$)$?<%hd~aa{pZ&`?hzBH#F30aJVn)43< zp8s3lh0E$p1cAq=ZSVK}L6q7`6K16OPN~i>x4WS`y4w5PK@~3*FK!vWzJi}Vbn(?Z zU23|Z1Y+m=Nd&Ys6mL?rz)<0HgJMJuH6s71#urbtG=q7H7*jDpJ$Dm!-zj&las0D(gd4Xmg{mjL1C4#DyLzWD3us{$$E$M3XDCwbtOcs!?%521ld_k5DgPkbfuuET5wd; zlnZ+RD;N=J_hN6$ii}mOcWViv*%OgJyV))cdz;45KrgxIRSR&qkb-<-s1X?uxx5DB z1<#>xR@Hn<&fVs+VXKyz<3OEejVB2nsh~+I6L-BN*Bxlg+-O&hZkT>`tDGsdQ9>EV zuqv|?W_}cwn#JjBi;^^i0IJ9Xwo$lzT2+rjebx?lRePKSnZktj#nGQubhN)G8|r?S zr~ZO597s=H>3%qV;pI(gy63B9%DQfjJ*o0ao=#>36YhE3Uf`fPC8r0uy;b!UPVfDw z`!FRHF|FjDe-=Auv<4SQcqr4IQd4GwJ!!f*lpwE7>uq~@HTgLi2+B&YLg&8{%-mo0 z8mVVSV@x|S*DR>ZP1Uc|;1xSNC968jo8G)5tm(75wWTe6PNjfVfqumRS^#)d)2Npv zC`Mgt%+%XXWjMbnIPo>Sv|$B0gh%^z;nf=e=<~<_1=m~80j|qr@*Ncd3HUak28e+| zEhRvVFkLgRuOgBr0BA9EHC7-?{M^=X;*Q5y;csivODhUlC1gFJ1tkm!YzP2!7%+QptyoZ=5fu{>GFS!# zQ3QcP(gZAk00Am+(e4r!)?kU?P$Ys8#iSuYYY|xi0stTYuo!KCMHtu;BT9u_fTBr& zKqC_}BYkp`ra}M^0U!h?Zmd%7Fn$1NUYq?XE;>>OA|!w!D1rzKh=hy+i0nUM1p!GI zSpX0an1w>EL;OGKVh4SJMQXnQ0013yMObuWZ*6U5Zgc=ca%Ew3Wn>_CX>@2HRA^-& XM@dakIfOYS00000NkvXXu0mjfMJT2K diff --git a/abe.spec b/abe.spec index 20d0cad..c2f08d9 100644 --- a/abe.spec +++ b/abe.spec @@ -1,6 +1,6 @@ Name: abe Version: 1.1 -Release: 23%{?dist} +Release: 24%{?dist} Summary: Scrolling, platform-jumping, ancient pyramid exploring game Group: Amusements/Games @@ -15,7 +15,7 @@ Patch0: %{name}-1.1-settings.patch # Fix a double free() bug. Sent upstream 15 Mar 2011: # https://sourceforge.net/tracker/?func=detail&aid=3214269&group_id=70141&atid=526745 Patch1: %{name}-1.1-doublefree.patch -# Fix an incorrect printf format specifier. Sent upstram 15 Mar 2011: +# Fix an incorrect printf format specifier. Sent upstream 15 Mar 2011: # https://sourceforge.net/tracker/?func=detail&aid=3214270&group_id=70141&atid=526745 Patch2: %{name}-1.1-format.patch # Add support for aarch64. Sent upstream 25 Mar 2013: @@ -99,6 +99,10 @@ gtk-update-icon-cache %{icondir} >&/dev/null ||: %{_datadir}/icons/hicolor/*/apps/%{name}.png %changelog +* Wed Aug 13 2014 Jerry James - 1.1-24 +- Drop unused abe.png file +- Update -aarch64 patch with newer config.{guess,sub} + * Mon Jul 21 2014 Jerry James - 1.1-23 - Add icons of varying sizes - Use the new license macro From aca251c575214ef0249f97e812997bd7af6bd3e6 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Fri, 15 Aug 2014 19:52:25 +0000 Subject: [PATCH 18/56] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- abe.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abe.spec b/abe.spec index c2f08d9..937f6b7 100644 --- a/abe.spec +++ b/abe.spec @@ -1,6 +1,6 @@ Name: abe Version: 1.1 -Release: 24%{?dist} +Release: 25%{?dist} Summary: Scrolling, platform-jumping, ancient pyramid exploring game Group: Amusements/Games @@ -99,6 +99,9 @@ gtk-update-icon-cache %{icondir} >&/dev/null ||: %{_datadir}/icons/hicolor/*/apps/%{name}.png %changelog +* Fri Aug 15 2014 Fedora Release Engineering - 1.1-25 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Wed Aug 13 2014 Jerry James - 1.1-24 - Drop unused abe.png file - Update -aarch64 patch with newer config.{guess,sub} From 36f117d90efb0dbcb76803a4f728929ce8770079 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Tue, 16 Jun 2015 23:32:14 +0000 Subject: [PATCH 19/56] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- abe.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abe.spec b/abe.spec index 937f6b7..2b1c40f 100644 --- a/abe.spec +++ b/abe.spec @@ -1,6 +1,6 @@ Name: abe Version: 1.1 -Release: 25%{?dist} +Release: 26%{?dist} Summary: Scrolling, platform-jumping, ancient pyramid exploring game Group: Amusements/Games @@ -99,6 +99,9 @@ gtk-update-icon-cache %{icondir} >&/dev/null ||: %{_datadir}/icons/hicolor/*/apps/%{name}.png %changelog +* Tue Jun 16 2015 Fedora Release Engineering - 1.1-26 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Fri Aug 15 2014 Fedora Release Engineering - 1.1-25 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From 1f54ff9817aaf37853621c0e3be857e687c6f5f7 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Tue, 16 Jun 2015 20:55:07 -0600 Subject: [PATCH 20/56] Fix FTBFS in Rawhide. Update appdata file. --- abe.appdata.xml | 28 +++++++++++++++++++--------- abe.spec | 2 +- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/abe.appdata.xml b/abe.appdata.xml index 92c7da7..2ffa299 100644 --- a/abe.appdata.xml +++ b/abe.appdata.xml @@ -1,7 +1,9 @@ - - abe.desktop - CC0 + + abe.desktop + CC0-1.0 + GPL-1.0+ + abe Abe's Amazing Adventure

@@ -15,11 +17,19 @@

- http://abe.sourceforge.net/screen0-4-1.png - http://abe.sourceforge.net/screen2-4-2.png + + http://abe.sourceforge.net/screen0-4-1.png + Abe dodging an obstacle + + + http://abe.sourceforge.net/screen2-4-2.png + Abe climbing a ladder + + loganjerry@gmail.com + Gabor Torok + Pedro Izecksohn + Alex Clarck http://abe.sourceforge.net/ - - + http://sourceforge.net/p/abe/bugs/ + diff --git a/abe.spec b/abe.spec index 2b1c40f..f3b0b36 100644 --- a/abe.spec +++ b/abe.spec @@ -51,7 +51,7 @@ mv -f COPYING.new COPYING %build %configure --with-data-dir=%{_datadir}/%{name} -sed -i "s/^CFLAGS =.*/CFLAGS = ${RPM_OPT_FLAGS} \$\(SDL_CFLAGS\)/" src/Makefile +sed -i "s|^CFLAGS =.*|CFLAGS = ${RPM_OPT_FLAGS} \$\(SDL_CFLAGS\)|" src/Makefile make %{?_smp_mflags} %install From 2f7f464cec04aadb03f06a7d6dee53596d7e27b6 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 3 Feb 2016 15:55:19 +0000 Subject: [PATCH 21/56] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- abe.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abe.spec b/abe.spec index f3b0b36..96ca92d 100644 --- a/abe.spec +++ b/abe.spec @@ -1,6 +1,6 @@ Name: abe Version: 1.1 -Release: 26%{?dist} +Release: 27%{?dist} Summary: Scrolling, platform-jumping, ancient pyramid exploring game Group: Amusements/Games @@ -99,6 +99,9 @@ gtk-update-icon-cache %{icondir} >&/dev/null ||: %{_datadir}/icons/hicolor/*/apps/%{name}.png %changelog +* Wed Feb 03 2016 Fedora Release Engineering - 1.1-27 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Tue Jun 16 2015 Fedora Release Engineering - 1.1-26 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From bd333ef542fe2e35740fdb1ce3d3583d724752f1 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Thu, 15 Sep 2016 16:03:38 -0600 Subject: [PATCH 22/56] Add OARS data to the appdata file. Also, update -aarch64 patch with newer config.{guess,sub}. --- abe-1.1-aarch64.patch | 659 +++++++++++++++++++++++++++--------------- abe.appdata.xml | 22 ++ abe.spec | 14 +- 3 files changed, 460 insertions(+), 235 deletions(-) diff --git a/abe-1.1-aarch64.patch b/abe-1.1-aarch64.patch index 480d876..cf4dd23 100644 --- a/abe-1.1-aarch64.patch +++ b/abe-1.1-aarch64.patch @@ -1,14 +1,14 @@ --- config.guess.orig 2005-03-05 09:20:39.000000000 -0700 -+++ config.guess 2014-06-09 08:07:14.000000000 -0600 ++++ config.guess 2016-09-15 15:57:52.672455013 -0600 @@ -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 -# Free Software Foundation, Inc. -+# Copyright 1992-2013 Free Software Foundation, Inc. ++# Copyright 1992-2016 Free Software Foundation, Inc. -timestamp='2001-09-04' -+timestamp='2013-11-29' ++timestamp='2016-09-11' # 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 @@ -17,7 +17,7 @@ # (at your option) any later version. # # This program is distributed in the hope that it will be useful, but -@@ -16,23 +15,22 @@ +@@ -16,23 +15,22 @@ timestamp='2001-09-04' # General Public License for more details. # # You should have received a copy of the GNU General Public License @@ -39,29 +39,29 @@ -# 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. -+# Originally written by Per Bothner. ++# Originally written by Per Bothner; maintained since 2000 by Ben Elliston. # -# The plan is that this can be called by configure scripts if you -# don't specify an explicit build system type. +# 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 ++# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess +# -+# Please send patches with a ChangeLog entry to config-patches@gnu.org. ++# Please send patches to . + me=`echo "$0" | sed -e 's,.*/,,'` -@@ -52,8 +50,7 @@ +@@ -52,8 +50,7 @@ version="\ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 -Free Software Foundation, Inc. -+Copyright 1992-2013 Free Software Foundation, Inc. ++Copyright 1992-2016 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." -@@ -65,11 +62,11 @@ +@@ -65,11 +62,11 @@ Try \`$me --help' for more information." while test $# -gt 0 ; do case $1 in --time-stamp | --time* | -t ) @@ -76,7 +76,7 @@ -- ) # Stop option processing shift; break ;; - ) # Use stdin as input. -@@ -87,30 +84,42 @@ +@@ -87,30 +84,42 @@ if test $# != 0; then exit 1 fi @@ -129,7 +129,7 @@ # This is needed to find uname on a Pyramid OSx when run in the BSD universe. # (ghazi@noc.rutgers.edu 1994-08-24) -@@ -123,36 +132,59 @@ +@@ -123,36 +132,69 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` | UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown @@ -150,7 +150,7 @@ + LIBC=gnu + #endif + EOF -+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` ++ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'` + ;; +esac + @@ -182,21 +182,32 @@ + # Note: NetBSD doesn't particularly care about the vendor + # portion of the name. We always set it to "unknown". + sysctl="sysctl -n hw.machine_arch" -+ UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \ -+ /usr/sbin/$sysctl 2>/dev/null || echo unknown)` ++ UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \ ++ /sbin/$sysctl 2>/dev/null || \ ++ /usr/sbin/$sysctl 2>/dev/null || \ ++ echo unknown)` + case "${UNAME_MACHINE_ARCH}" in + armeb) machine=armeb-unknown ;; + arm*) machine=arm-unknown ;; + sh3el) machine=shl-unknown ;; + sh3eb) machine=sh-unknown ;; + sh5el) machine=sh5le-unknown ;; ++ earmv*) ++ arch=`echo ${UNAME_MACHINE_ARCH} | sed -e 's,^e\(armv[0-9]\).*$,\1,'` ++ endian=`echo ${UNAME_MACHINE_ARCH} | sed -ne 's,^.*\(eb\)$,\1,p'` ++ machine=${arch}${endian}-unknown ++ ;; + *) machine=${UNAME_MACHINE_ARCH}-unknown ;; esac # The Operating System including object format, if it has switched - # to ELF recently, or will in the future. +- # to ELF recently, or will in the future. - case "${UNAME_MACHINE}" in - i386|sparc|amiga|arm*|hp300|mvme68k|vax|atari|luna68k|mac68k|news68k|next68k|pc532|sun3*|x68k) ++ # to ELF recently (or will in the future) and ABI. + case "${UNAME_MACHINE_ARCH}" in ++ earm*) ++ os=netbsdelf ++ ;; + arm*|i386|m68k|ns32k|sh3*|sparc|vax) eval $set_cc_for_build if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ @@ -205,12 +216,19 @@ then # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). # Return netbsd for either. FIX? -@@ -162,124 +194,139 @@ +@@ -162,124 +204,153 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ fi ;; *) - os=netbsd + os=netbsd ++ ;; ++ esac ++ # Determine ABI tags. ++ case "${UNAME_MACHINE_ARCH}" in ++ earm*) ++ expr='s/^earmv[0-9]/-eabi/;s/eb$//' ++ abi=`echo ${UNAME_MACHINE_ARCH} | sed -e "$expr"` ;; esac # The OS release @@ -224,14 +242,15 @@ + release='-gnu' + ;; + *) -+ release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` ++ release=`echo ${UNAME_RELEASE} | sed -e 's/[-_].*//' | cut -d. -f1,2` + ;; + esac # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: # contains redundant information, the shorter form: # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. - echo "${machine}-${os}${release}" +- echo "${machine}-${os}${release}" - exit 0 ;; ++ echo "${machine}-${os}${release}${abi}" + exit ;; + *:Bitrig:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` @@ -241,6 +260,10 @@ + UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` + echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} + exit ;; ++ *:LibertyBSD:*:*) ++ UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'` ++ echo ${UNAME_MACHINE_ARCH}-unknown-libertybsd${UNAME_RELEASE} ++ exit ;; + *:ekkoBSD:*:*) + echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} + exit ;; @@ -252,6 +275,9 @@ + exit ;; + *:MirBSD:*:*) + echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} ++ exit ;; ++ *:Sortix:*:*) ++ echo ${UNAME_MACHINE}-unknown-sortix + exit ;; alpha:OSF1:*:*) - if test $UNAME_RELEASE = "V4.0"; then @@ -271,35 +297,35 @@ + ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` + case "$ALPHA_CPU_TYPE" in + "EV4 (21064)") -+ UNAME_MACHINE="alpha" ;; ++ UNAME_MACHINE=alpha ;; + "EV4.5 (21064)") -+ UNAME_MACHINE="alpha" ;; ++ UNAME_MACHINE=alpha ;; + "LCA4 (21066/21068)") -+ UNAME_MACHINE="alpha" ;; ++ UNAME_MACHINE=alpha ;; + "EV5 (21164)") -+ UNAME_MACHINE="alphaev5" ;; ++ UNAME_MACHINE=alphaev5 ;; + "EV5.6 (21164A)") -+ UNAME_MACHINE="alphaev56" ;; ++ UNAME_MACHINE=alphaev56 ;; + "EV5.6 (21164PC)") -+ UNAME_MACHINE="alphapca56" ;; ++ UNAME_MACHINE=alphapca56 ;; + "EV5.7 (21164PC)") -+ UNAME_MACHINE="alphapca57" ;; ++ UNAME_MACHINE=alphapca57 ;; + "EV6 (21264)") -+ UNAME_MACHINE="alphaev6" ;; ++ UNAME_MACHINE=alphaev6 ;; + "EV6.7 (21264A)") -+ UNAME_MACHINE="alphaev67" ;; ++ UNAME_MACHINE=alphaev67 ;; + "EV6.8CB (21264C)") -+ UNAME_MACHINE="alphaev68" ;; ++ UNAME_MACHINE=alphaev68 ;; + "EV6.8AL (21264B)") -+ UNAME_MACHINE="alphaev68" ;; ++ UNAME_MACHINE=alphaev68 ;; + "EV6.8CX (21264D)") -+ UNAME_MACHINE="alphaev68" ;; ++ UNAME_MACHINE=alphaev68 ;; + "EV6.9A (21264/EV69A)") -+ UNAME_MACHINE="alphaev69" ;; ++ UNAME_MACHINE=alphaev69 ;; + "EV7 (21364)") -+ UNAME_MACHINE="alphaev7" ;; ++ UNAME_MACHINE=alphaev7 ;; + "EV7.9 (21364A)") -+ UNAME_MACHINE="alphaev79" ;; ++ UNAME_MACHINE=alphaev79 ;; + esac + # A Pn.n version is a patched version. # A Vn.n version is a released version. @@ -361,7 +387,7 @@ - rm -f $dummy.s $dummy - echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - exit 0 ;; -+ echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` ++ echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz` + # Reset EXIT trap before exiting to avoid spurious non-zero exit code. + exitcode=$? + trap '' 0 @@ -433,7 +459,7 @@ 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 -@@ -287,25 +334,51 @@ +@@ -287,25 +358,51 @@ EOF else echo pyramid-pyramid-bsd fi @@ -469,16 +495,16 @@ + exit ;; + i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) + eval $set_cc_for_build -+ SUN_ARCH="i386" ++ 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 [ "$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) | \ ++ (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then -+ SUN_ARCH="x86_64" ++ SUN_ARCH=x86_64 + fi + fi + echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` @@ -493,7 +519,7 @@ sun4*:SunOS:*:*) case "`/usr/bin/arch -k`" in Series*|S4*) -@@ -314,12 +387,12 @@ +@@ -314,13 +411,13 @@ EOF esac # Japanese Language versions have a version number like `4.1.3-JL'. echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` @@ -505,11 +531,13 @@ + exit ;; sun*:*:4.2BSD:*) - UNAME_RELEASE=`(head -1 /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` +- test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 + UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` - test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 ++ test "x${UNAME_RELEASE}" = x && UNAME_RELEASE=3 case "`/bin/arch`" in sun3) -@@ -329,16 +402,10 @@ + echo m68k-sun-sunos${UNAME_RELEASE} +@@ -329,16 +426,10 @@ EOF echo sparc-sun-sunos${UNAME_RELEASE} ;; esac @@ -528,7 +556,7 @@ # 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 -@@ -348,50 +415,41 @@ +@@ -348,50 +439,41 @@ EOF # MiNT. But MiNT is downward compatible to TOS, so this should # be no problem. atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) @@ -598,7 +626,7 @@ mips:*:*:UMIPS | mips:*:*:RISCos) eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c -@@ -415,30 +473,36 @@ +@@ -415,30 +497,36 @@ EOF exit (-1); } EOF @@ -647,7 +675,7 @@ if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] then if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ -@@ -451,29 +515,29 @@ +@@ -451,29 +539,29 @@ EOF else echo i586-dg-dgux${UNAME_RELEASE} fi @@ -686,7 +714,7 @@ ia64:AIX:*:*) if [ -x /usr/bin/oslevel ] ; then IBM_REV=`/usr/bin/oslevel` -@@ -481,7 +545,7 @@ +@@ -481,7 +569,7 @@ EOF IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} fi echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} @@ -695,7 +723,7 @@ *:AIX:2:3) if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then eval $set_cc_for_build -@@ -496,17 +560,20 @@ +@@ -496,118 +584,140 @@ EOF exit(0); } EOF @@ -722,7 +750,14 @@ if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then IBM_ARCH=rs6000 else -@@ -518,96 +585,114 @@ + IBM_ARCH=powerpc + fi +- if [ -x /usr/bin/oslevel ] ; then +- IBM_REV=`/usr/bin/oslevel` ++ if [ -x /usr/bin/lslpp ] ; then ++ IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc | ++ awk -F: '{ print $3 }' | sed s/[0-9]*$/0/` + else IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} fi echo ${IBM_ARCH}-ibm-aix${IBM_REV} @@ -785,13 +820,13 @@ + 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 ++ 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 ++ 32) HP_ARCH=hppa2.0n ;; ++ 64) HP_ARCH=hppa2.0w ;; ++ '') HP_ARCH=hppa2.0 ;; # HP-UX 10.20 + esac ;; + esac + fi @@ -862,11 +897,11 @@ - if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi - rm -f $dummy.c $dummy - fi ;; -+ (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` ++ (CCOPTS="" $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` + test -z "$HP_ARCH" && HP_ARCH=hppa + fi ;; esac -+ if [ ${HP_ARCH} = "hppa2.0w" ] ++ if [ ${HP_ARCH} = hppa2.0w ] + then + eval $set_cc_for_build + @@ -879,12 +914,12 @@ + # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess + # => hppa64-hp-hpux11.23 + -+ if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | ++ if echo __LP64__ | (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | + grep -q __LP64__ + then -+ HP_ARCH="hppa2.0w" ++ HP_ARCH=hppa2.0w + else -+ HP_ARCH="hppa64" ++ HP_ARCH=hppa64 + fi + fi echo ${HP_ARCH}-hp-hpux${HPUX_REV} @@ -898,7 +933,7 @@ 3050*:HI-UX:*:*) eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c -@@ -635,158 +720,176 @@ +@@ -635,158 +745,176 @@ EOF exit (0); } EOF @@ -1003,7 +1038,7 @@ + echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) - FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` +- 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}" @@ -1011,13 +1046,14 @@ - hp300:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; -+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` ++ 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 ;; + 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/ /_/'` ++ 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:*:*) @@ -1058,7 +1094,7 @@ echo ${UNAME_MACHINE}-pc-mingw32 - exit 0 ;; + exit ;; -+ i*:MSYS*:*) ++ *:MSYS*:*) + echo ${UNAME_MACHINE}-pc-msys + exit ;; + i*:windows32*:*) @@ -1118,7 +1154,7 @@ + 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/[-(].*//'`-${LIBC} ++ echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} + exit ;; i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix @@ -1155,7 +1191,7 @@ alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in EV5) UNAME_MACHINE=alphaev5 ;; -@@ -796,104 +899,166 @@ +@@ -796,104 +924,175 @@ EOF EV6) UNAME_MACHINE=alphaev6 ;; EV67) UNAME_MACHINE=alphaev67 ;; EV68*) UNAME_MACHINE=alphaev68 ;; @@ -1166,7 +1202,7 @@ - exit 0 ;; + esac + objdump --private-headers /bin/sh | grep -q ld.so.1 -+ if test "$?" = 0 ; then LIBC="gnulibc1" ; fi ++ if test "$?" = 0 ; then LIBC=gnulibc1 ; fi + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + arc:Linux:*:* | arceb:Linux:*:*) @@ -1197,6 +1233,9 @@ + crisv32:Linux:*:*) + echo ${UNAME_MACHINE}-axis-linux-${LIBC} + exit ;; ++ e2k:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} ++ exit ;; + frv:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; @@ -1209,6 +1248,9 @@ + ia64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; ++ k1om:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} ++ exit ;; + m32r*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; @@ -1234,10 +1276,10 @@ + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } + ;; -+ or1k:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} ++ openrisc*:Linux:*:*) ++ echo or1k-unknown-linux-${LIBC} + exit ;; -+ or32:Linux:*:*) ++ or32:Linux:*:* | or1k*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + padre:Linux:*:*) @@ -1272,6 +1314,9 @@ + exit ;; + ppcle:Linux:*:*) + echo powerpcle-unknown-linux-${LIBC} ++ exit ;; ++ riscv32:Linux:*:* | riscv64:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; s390:Linux:*:* | s390x:Linux:*:*) - echo ${UNAME_MACHINE}-ibm-linux @@ -1356,7 +1401,7 @@ - rm -f $dummy.c $dummy - test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 - ;; -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} ++ echo ${UNAME_MACHINE}-pc-linux-${LIBC} + exit ;; + xtensa*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} @@ -1404,7 +1449,7 @@ 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 -@@ -901,99 +1066,113 @@ +@@ -901,99 +1100,113 @@ EOF else echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} fi @@ -1457,7 +1502,7 @@ + # uname -m prints for DJGPP always 'pc', but it prints nothing about + # the processor, so we play safe by assuming i586. + # Note: whatever this is, it MUST be the same as what config.sub -+ # prints for the "djgpp" host, or else GDB configury will decide that ++ # prints for the "djgpp" host, or else GDB configure will decide that + # this is a cross-build. + echo i586-pc-msdosdjgpp + exit ;; @@ -1557,7 +1602,7 @@ *:SINIX-*:*:*) if uname -p 2>/dev/null >/dev/null ; then UNAME_MACHINE=`(uname -p) 2>/dev/null` -@@ -1001,82 +1180,138 @@ +@@ -1001,288 +1214,217 @@ EOF else echo ns32k-sni-sysv fi @@ -1646,6 +1691,9 @@ + exit ;; + SX-8R:SUPER-UX:*:*) + echo sx8r-nec-superux${UNAME_RELEASE} ++ exit ;; ++ SX-ACE:SUPER-UX:*:*) ++ echo sxace-nec-superux${UNAME_RELEASE} + exit ;; Power*:Rhapsody:*:*) echo powerpc-apple-rhapsody${UNAME_RELEASE} @@ -1664,9 +1712,9 @@ + UNAME_PROCESSOR=powerpc + fi + if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then -+ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then ++ 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) | \ ++ (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + case $UNAME_PROCESSOR in @@ -1689,7 +1737,7 @@ *:procnto*:*:* | *:QNX:[0123456789]*:*) - if test "${UNAME_MACHINE}" = "x86pc"; then + UNAME_PROCESSOR=`uname -p` -+ if test "$UNAME_PROCESSOR" = "x86"; then ++ if test "$UNAME_PROCESSOR" = x86; then + UNAME_PROCESSOR=i386 UNAME_MACHINE=pc fi @@ -1727,7 +1775,11 @@ *:Plan9:*:*) # "uname -m" is not consistent, so use $cputype instead. 386 # is converted to i386 for consistency with other x86 -@@ -1087,41 +1322,55 @@ + # operating systems. +- if test "$cputype" = "386"; then ++ if test "$cputype" = 386; then + UNAME_MACHINE=i386 + else UNAME_MACHINE="$cputype" fi echo ${UNAME_MACHINE}-unknown-plan9 @@ -1785,7 +1837,7 @@ + echo i386-pc-xenix + exit ;; + i*86:skyos:*:*) -+ echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' ++ echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE} | sed -e 's/ .*$//'` + exit ;; + i*86:rdos:*:*) + echo ${UNAME_MACHINE}-pc-rdos @@ -1795,102 +1847,199 @@ + exit ;; + x86_64:VMkernel:*:*) + echo ${UNAME_MACHINE}-unknown-esx ++ exit ;; ++ amd64:Isilon\ OneFS:*:*) ++ echo x86_64-unknown-onefs + 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 +-eval $set_cc_for_build +-cat >$dummy.c < +-# include +-#endif +-main () +-{ +-#if defined (sony) +-#if defined (MIPSEB) +- /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed, +- I don't know.... */ +- printf ("mips-sony-bsd\n"); exit (0); +-#else +-#include +- printf ("m68k-sony-newsos%s\n", +-#ifdef NEWSOS4 - "4" -+ "4" - #else +-#else - "" -+ "" - #endif +-#endif - ); exit (0); -+ ); exit (0); - #endif - #endif - - #if defined (__arm) && defined (__acorn) && defined (__unix) +-#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) -@@ -1237,12 +1486,12 @@ - } - EOF - +-#endif +- +-#if defined (hp300) && !defined (hpux) +- printf ("m68k-hp-bsd\n"); exit (0); +-#endif +- +-#if defined (NeXT) +-#if !defined (__ARCHITECTURE__) +-#define __ARCHITECTURE__ "m68k" +-#endif +- int version; +- version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`; +- if (version < 4) +- printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); +- else +- printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version); +- exit (0); +-#endif +- +-#if defined (MULTIMAX) || defined (n16) +-#if defined (UMAXV) +- printf ("ns32k-encore-sysv\n"); exit (0); +-#else +-#if defined (CMU) +- printf ("ns32k-encore-mach\n"); exit (0); +-#else +- printf ("ns32k-encore-bsd\n"); exit (0); +-#endif +-#endif +-#endif +- +-#if defined (__386BSD__) +- printf ("i386-pc-bsd\n"); exit (0); +-#endif +- +-#if defined (sequent) +-#if defined (i386) +- printf ("i386-sequent-dynix\n"); exit (0); +-#endif +-#if defined (ns32000) +- printf ("ns32k-sequent-dynix\n"); exit (0); +-#endif +-#endif +- +-#if defined (_SEQUENT_) +- struct utsname un; +- +- uname(&un); +- +- if (strncmp(un.version, "V2", 2) == 0) { +- printf ("i386-sequent-ptx2\n"); exit (0); +- } +- if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */ +- printf ("i386-sequent-ptx1\n"); exit (0); +- } +- printf ("i386-sequent-ptx\n"); exit (0); +- +-#endif +- +-#if defined (vax) +-# if !defined (ultrix) +-# include +-# if defined (BSD) +-# if BSD == 43 +- printf ("vax-dec-bsd4.3\n"); exit (0); +-# else +-# if BSD == 199006 +- printf ("vax-dec-bsd4.3reno\n"); exit (0); +-# else +- printf ("vax-dec-bsd\n"); exit (0); +-# endif +-# endif +-# else +- printf ("vax-dec-bsd\n"); exit (0); +-# endif +-# else +- printf ("vax-dec-ultrix\n"); exit (0); +-# endif +-#endif +- +-#if defined (alliant) && defined (i860) +- printf ("i860-alliant-bsd\n"); exit (0); +-#endif +- +- exit (1); +-} +-EOF +- -$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm -f $dummy.c $dummy && exit 0 -rm -f $dummy.c $dummy -+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && -+ { echo "$SYSTEM_NAME"; exit; } - - # Apollos put the system type in the environment. - +- +-# 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) +- +-if [ -x /usr/convex/getsysinfo ] +-then +- case `getsysinfo -f cpu_type` in +- c1*) +- echo c1-convex-bsd +- exit 0 ;; +- c2*) +- if getsysinfo -f scalar_acc +- then echo c32-convex-bsd +- else echo c2-convex-bsd +- fi +- exit 0 ;; +- c34*) +- echo c34-convex-bsd +- exit 0 ;; +- c38*) +- echo c38-convex-bsd +- exit 0 ;; +- c4*) +- echo c4-convex-bsd +- exit 0 ;; +- esac +-fi +- + cat >&2 < in order to provide the needed +-information to handle your system. ++If $0 has already been updated, send the following data and any ++information you think might be pertinent to config-patches@gnu.org to ++provide the necessary information to handle your system. + + config.guess timestamp = $timestamp - If the version you run ($0) is already up to date, please - send the following data and any information you think might be --- config.sub.orig 2005-03-05 09:20:39.000000000 -0700 -+++ config.sub 2014-06-09 08:07:14.000000000 -0600 -@@ -1,41 +1,40 @@ ++++ config.sub 2016-09-15 15:58:41.352550325 -0600 +@@ -1,33 +1,29 @@ #! /bin/sh # Configuration validation subroutine script. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 -# Free Software Foundation, Inc. -+# Copyright 1992-2013 Free Software Foundation, Inc. ++# Copyright 1992-2016 Free Software Foundation, Inc. -timestamp='2001-09-07' -+timestamp='2013-10-01' ++timestamp='2016-09-05' -# This file is (in principle) common to ALL GNU software. -# The presence of a machine in this file suggests that SOME GNU software @@ -1927,33 +2076,41 @@ +# 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 . + -+# Please send patches with a ChangeLog entry to config-patches@gnu.org. + + # Please send patches to . # - # Configuration subroutine to validate and canonicalize a configuration type. - # Supply the specified configuration type as an argument. +@@ -36,6 +32,9 @@ timestamp='2001-09-07' # 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 ++# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub + # 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. -@@ -69,8 +68,7 @@ +@@ -54,8 +53,7 @@ timestamp='2001-09-07' + me=`echo "$0" | sed -e 's,.*/,,'` + + usage="\ +-Usage: $0 [OPTION] CPU-MFR-OPSYS +- $0 [OPTION] ALIAS ++Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS + + Canonicalize a configuration name. + +@@ -69,8 +67,7 @@ Report bugs and patches to + + mild + mild + none + none + none + none + none + none + none + none + none + none + none + none + none + none + none + none + none + none + http://abe.sourceforge.net/screen0-4-1.png diff --git a/abe.spec b/abe.spec index 96ca92d..b29d6dd 100644 --- a/abe.spec +++ b/abe.spec @@ -1,9 +1,8 @@ Name: abe Version: 1.1 -Release: 27%{?dist} +Release: 28%{?dist} Summary: Scrolling, platform-jumping, ancient pyramid exploring game -Group: Amusements/Games License: GPL+ URL: http://abe.sourceforge.net/ Source0: http://downloads.sourceforge.net/abe/%{name}-%{version}.tar.gz @@ -24,9 +23,12 @@ Patch3: %{name}-1.1-aarch64.patch # Fix build failure with -Werror=format-security Patch4: %{name}-1.1-format-security.patch -BuildRequires: SDL-devel >= 1.2.3, SDL_mixer-devel >= 1.2.3 -BuildRequires: libXmu-devel libXi-devel BuildRequires: desktop-file-utils +BuildRequires: gcc +BuildRequires: libXi-devel +BuildRequires: libXmu-devel +BuildRequires: SDL-devel +BuildRequires: SDL_mixer-devel Requires: hicolor-icon-theme @@ -99,6 +101,10 @@ gtk-update-icon-cache %{icondir} >&/dev/null ||: %{_datadir}/icons/hicolor/*/apps/%{name}.png %changelog +* Thu Sep 15 2016 Jerry James -1.1-28 +- Add OARS data to the appdata file +- Update -aarch64 patch with newer config.{guess,sub} + * Wed Feb 03 2016 Fedora Release Engineering - 1.1-27 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From f0c488dcab3c3b2bb1b479447d39497c398d1dbd Mon Sep 17 00:00:00 2001 From: Jerry James Date: Sat, 28 Jan 2017 11:06:20 -0700 Subject: [PATCH 23/56] Minor spec file cleanup. --- abe.spec | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/abe.spec b/abe.spec index b29d6dd..4061e32 100644 --- a/abe.spec +++ b/abe.spec @@ -82,12 +82,10 @@ EOF desktop-file-install --dir $RPM_BUILD_ROOT/%{_datadir}/applications/ %{name}.desktop %post -update-desktop-database %{_datadir}/applications &>/dev/null || : touch --no-create %{icondir} >&/dev/null ||: gtk-update-icon-cache %{icondir} >&/dev/null ||: %postun -update-desktop-database %{_datadir}/applications &>/dev/null touch --no-create %{icondir} >&/dev/null ||: gtk-update-icon-cache %{icondir} >&/dev/null ||: @@ -101,7 +99,7 @@ gtk-update-icon-cache %{icondir} >&/dev/null ||: %{_datadir}/icons/hicolor/*/apps/%{name}.png %changelog -* Thu Sep 15 2016 Jerry James -1.1-28 +* Thu Sep 15 2016 Jerry James - 1.1-28 - Add OARS data to the appdata file - Update -aarch64 patch with newer config.{guess,sub} From f976a6f8808cb423abf27b119488ea88d54a3258 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 10 Feb 2017 05:40:35 +0000 Subject: [PATCH 24/56] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- abe.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abe.spec b/abe.spec index 4061e32..f4a9f7c 100644 --- a/abe.spec +++ b/abe.spec @@ -1,6 +1,6 @@ Name: abe Version: 1.1 -Release: 28%{?dist} +Release: 29%{?dist} Summary: Scrolling, platform-jumping, ancient pyramid exploring game License: GPL+ @@ -99,6 +99,9 @@ gtk-update-icon-cache %{icondir} >&/dev/null ||: %{_datadir}/icons/hicolor/*/apps/%{name}.png %changelog +* Fri Feb 10 2017 Fedora Release Engineering - 1.1-29 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Thu Sep 15 2016 Jerry James - 1.1-28 - Add OARS data to the appdata file - Update -aarch64 patch with newer config.{guess,sub} From 6af5570562835b385ad4e4b488801affa443b520 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 02:30:41 +0000 Subject: [PATCH 25/56] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- abe.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abe.spec b/abe.spec index f4a9f7c..6c5d794 100644 --- a/abe.spec +++ b/abe.spec @@ -1,6 +1,6 @@ Name: abe Version: 1.1 -Release: 29%{?dist} +Release: 30%{?dist} Summary: Scrolling, platform-jumping, ancient pyramid exploring game License: GPL+ @@ -99,6 +99,9 @@ gtk-update-icon-cache %{icondir} >&/dev/null ||: %{_datadir}/icons/hicolor/*/apps/%{name}.png %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 1.1-30 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Fri Feb 10 2017 Fedora Release Engineering - 1.1-29 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From dd39b7c5bc56c906d7988d444d05990782388b40 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 2 Aug 2017 17:20:55 +0000 Subject: [PATCH 26/56] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- abe.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abe.spec b/abe.spec index 6c5d794..ce7b0c3 100644 --- a/abe.spec +++ b/abe.spec @@ -1,6 +1,6 @@ Name: abe Version: 1.1 -Release: 30%{?dist} +Release: 31%{?dist} Summary: Scrolling, platform-jumping, ancient pyramid exploring game License: GPL+ @@ -99,6 +99,9 @@ gtk-update-icon-cache %{icondir} >&/dev/null ||: %{_datadir}/icons/hicolor/*/apps/%{name}.png %changelog +* Wed Aug 02 2017 Fedora Release Engineering - 1.1-31 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Wed Jul 26 2017 Fedora Release Engineering - 1.1-30 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 389f41e533bf572115ea92161c544df793492cca Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Sun, 7 Jan 2018 18:58:39 +0100 Subject: [PATCH 27/56] Remove obsolete scriptlets Signed-off-by: Igor Gnatenko --- abe.spec | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/abe.spec b/abe.spec index ce7b0c3..9b5cd52 100644 --- a/abe.spec +++ b/abe.spec @@ -1,6 +1,6 @@ Name: abe Version: 1.1 -Release: 31%{?dist} +Release: 32%{?dist} Summary: Scrolling, platform-jumping, ancient pyramid exploring game License: GPL+ @@ -81,14 +81,6 @@ EOF desktop-file-install --dir $RPM_BUILD_ROOT/%{_datadir}/applications/ %{name}.desktop -%post -touch --no-create %{icondir} >&/dev/null ||: -gtk-update-icon-cache %{icondir} >&/dev/null ||: - -%postun -touch --no-create %{icondir} >&/dev/null ||: -gtk-update-icon-cache %{icondir} >&/dev/null ||: - %files %doc README %license COPYING @@ -99,6 +91,9 @@ gtk-update-icon-cache %{icondir} >&/dev/null ||: %{_datadir}/icons/hicolor/*/apps/%{name}.png %changelog +* Sun Jan 07 2018 Igor Gnatenko - 1.1-32 +- Remove obsolete scriptlets + * Wed Aug 02 2017 Fedora Release Engineering - 1.1-31 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From e0b1cf7ca2c3f802f3c392ab9fa7ca87c1a1c5a4 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Sat, 3 Feb 2018 15:11:12 -0700 Subject: [PATCH 28/56] Minor spec file cleanup. --- abe.spec | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/abe.spec b/abe.spec index 9b5cd52..b056aa7 100644 --- a/abe.spec +++ b/abe.spec @@ -32,8 +32,6 @@ BuildRequires: SDL_mixer-devel Requires: hicolor-icon-theme -%global icondir %{_datadir}/icons/hicolor - %description A scrolling, platform-jumping, key-collecting, ancient pyramid exploring game, vaguely in the style of similar games for the Commodore+4. @@ -63,9 +61,9 @@ make DESTDIR=$RPM_BUILD_ROOT install mkdir -p $RPM_BUILD_ROOT/%{_datadir}/%{name} mkdir -p $RPM_BUILD_ROOT/%{_datadir}/appdata/ mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications/ -mkdir -p $RPM_BUILD_ROOT/%{icondir} +mkdir -p $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/ cp -p -r images maps sounds $RPM_BUILD_ROOT/%{_datadir}/%{name} -tar xJf %{SOURCE1} -C $RPM_BUILD_ROOT%{icondir} +tar xJf %{SOURCE1} -C $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/ install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_datadir}/appdata/ cat << EOF > %{name}.desktop From 916919f6baf941d3695486fb13d8360f32b80f1f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 01:44:07 +0000 Subject: [PATCH 29/56] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- abe.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abe.spec b/abe.spec index b056aa7..979f8d4 100644 --- a/abe.spec +++ b/abe.spec @@ -1,6 +1,6 @@ Name: abe Version: 1.1 -Release: 32%{?dist} +Release: 33%{?dist} Summary: Scrolling, platform-jumping, ancient pyramid exploring game License: GPL+ @@ -89,6 +89,9 @@ desktop-file-install --dir $RPM_BUILD_ROOT/%{_datadir}/applications/ %{name}.des %{_datadir}/icons/hicolor/*/apps/%{name}.png %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 1.1-33 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Sun Jan 07 2018 Igor Gnatenko - 1.1-32 - Remove obsolete scriptlets From 212dce30aba82eccdbbd2ba2faf04abffeae5c3b Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 10 Jul 2018 16:18:19 +0200 Subject: [PATCH 30/56] add BuildRequires: gcc-c++ Reference: https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot --- abe.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/abe.spec b/abe.spec index 979f8d4..94a6fed 100644 --- a/abe.spec +++ b/abe.spec @@ -23,6 +23,7 @@ Patch3: %{name}-1.1-aarch64.patch # Fix build failure with -Werror=format-security Patch4: %{name}-1.1-format-security.patch +BuildRequires: gcc-c++ BuildRequires: desktop-file-utils BuildRequires: gcc BuildRequires: libXi-devel From 9a03291e79585205c87c0f09504d6da4bc0c8737 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Tue, 10 Jul 2018 21:39:43 -0600 Subject: [PATCH 31/56] Don't need to BR both gcc and gcc-c++. There is no C++ code in this package, but the configure script checks for a C++ compiler. --- abe.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/abe.spec b/abe.spec index 94a6fed..9ff48fc 100644 --- a/abe.spec +++ b/abe.spec @@ -23,9 +23,8 @@ Patch3: %{name}-1.1-aarch64.patch # Fix build failure with -Werror=format-security Patch4: %{name}-1.1-format-security.patch -BuildRequires: gcc-c++ BuildRequires: desktop-file-utils -BuildRequires: gcc +BuildRequires: gcc-c++ BuildRequires: libXi-devel BuildRequires: libXmu-devel BuildRequires: SDL-devel From fc09ee14b01adc24482a044904c926b8f3823983 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 12 Jul 2018 19:55:23 +0000 Subject: [PATCH 32/56] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- abe.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abe.spec b/abe.spec index 9ff48fc..aa6c790 100644 --- a/abe.spec +++ b/abe.spec @@ -1,6 +1,6 @@ Name: abe Version: 1.1 -Release: 33%{?dist} +Release: 34%{?dist} Summary: Scrolling, platform-jumping, ancient pyramid exploring game License: GPL+ @@ -89,6 +89,9 @@ desktop-file-install --dir $RPM_BUILD_ROOT/%{_datadir}/applications/ %{name}.des %{_datadir}/icons/hicolor/*/apps/%{name}.png %changelog +* Thu Jul 12 2018 Fedora Release Engineering - 1.1-34 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Wed Feb 07 2018 Fedora Release Engineering - 1.1-33 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 6c27565c0c4a63d7dc7d67fd8aebd4ea11c053ce Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 31 Jan 2019 12:51:35 +0000 Subject: [PATCH 33/56] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- abe.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abe.spec b/abe.spec index aa6c790..8be8ea0 100644 --- a/abe.spec +++ b/abe.spec @@ -1,6 +1,6 @@ Name: abe Version: 1.1 -Release: 34%{?dist} +Release: 35%{?dist} Summary: Scrolling, platform-jumping, ancient pyramid exploring game License: GPL+ @@ -89,6 +89,9 @@ desktop-file-install --dir $RPM_BUILD_ROOT/%{_datadir}/applications/ %{name}.des %{_datadir}/icons/hicolor/*/apps/%{name}.png %changelog +* Thu Jan 31 2019 Fedora Release Engineering - 1.1-35 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Thu Jul 12 2018 Fedora Release Engineering - 1.1-34 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 9671839fd1d57cb071fdae23ebe6ba0978328d23 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jul 2019 17:26:22 +0000 Subject: [PATCH 34/56] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- abe.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abe.spec b/abe.spec index 8be8ea0..ffbeeb7 100644 --- a/abe.spec +++ b/abe.spec @@ -1,6 +1,6 @@ Name: abe Version: 1.1 -Release: 35%{?dist} +Release: 36%{?dist} Summary: Scrolling, platform-jumping, ancient pyramid exploring game License: GPL+ @@ -89,6 +89,9 @@ desktop-file-install --dir $RPM_BUILD_ROOT/%{_datadir}/applications/ %{name}.des %{_datadir}/icons/hicolor/*/apps/%{name}.png %changelog +* Wed Jul 24 2019 Fedora Release Engineering - 1.1-36 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Thu Jan 31 2019 Fedora Release Engineering - 1.1-35 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 9d69c859fe077d36e195b7cfc4901a984d111660 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 11:06:30 +0000 Subject: [PATCH 35/56] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- abe.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abe.spec b/abe.spec index ffbeeb7..01ec067 100644 --- a/abe.spec +++ b/abe.spec @@ -1,6 +1,6 @@ Name: abe Version: 1.1 -Release: 36%{?dist} +Release: 37%{?dist} Summary: Scrolling, platform-jumping, ancient pyramid exploring game License: GPL+ @@ -89,6 +89,9 @@ desktop-file-install --dir $RPM_BUILD_ROOT/%{_datadir}/applications/ %{name}.des %{_datadir}/icons/hicolor/*/apps/%{name}.png %changelog +* Tue Jan 28 2020 Fedora Release Engineering - 1.1-37 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Wed Jul 24 2019 Fedora Release Engineering - 1.1-36 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From f2339cae369927ff88a4198de81a7a237c69e72a Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Tue, 14 Jul 2020 15:14:11 +0000 Subject: [PATCH 36/56] Use make macros https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro --- abe.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/abe.spec b/abe.spec index 01ec067..a38b5bc 100644 --- a/abe.spec +++ b/abe.spec @@ -1,6 +1,6 @@ Name: abe Version: 1.1 -Release: 37%{?dist} +Release: 38%{?dist} Summary: Scrolling, platform-jumping, ancient pyramid exploring game License: GPL+ @@ -52,10 +52,10 @@ mv -f COPYING.new COPYING %build %configure --with-data-dir=%{_datadir}/%{name} sed -i "s|^CFLAGS =.*|CFLAGS = ${RPM_OPT_FLAGS} \$\(SDL_CFLAGS\)|" src/Makefile -make %{?_smp_mflags} +%make_build %install -make DESTDIR=$RPM_BUILD_ROOT install +%make_install # make install does not copy the game data files. mkdir -p $RPM_BUILD_ROOT/%{_datadir}/%{name} @@ -89,6 +89,10 @@ desktop-file-install --dir $RPM_BUILD_ROOT/%{_datadir}/applications/ %{name}.des %{_datadir}/icons/hicolor/*/apps/%{name}.png %changelog +* Tue Jul 14 2020 Tom Stellard - 1.1-38 +- Use make macros +- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro + * Tue Jan 28 2020 Fedora Release Engineering - 1.1-37 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 3eb4b8a427024fb08b5ea83173e4a93d6c0fe924 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 11:39:31 +0000 Subject: [PATCH 37/56] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- abe.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abe.spec b/abe.spec index a38b5bc..9ae0ef4 100644 --- a/abe.spec +++ b/abe.spec @@ -1,6 +1,6 @@ Name: abe Version: 1.1 -Release: 38%{?dist} +Release: 39%{?dist} Summary: Scrolling, platform-jumping, ancient pyramid exploring game License: GPL+ @@ -89,6 +89,9 @@ desktop-file-install --dir $RPM_BUILD_ROOT/%{_datadir}/applications/ %{name}.des %{_datadir}/icons/hicolor/*/apps/%{name}.png %changelog +* Mon Jul 27 2020 Fedora Release Engineering - 1.1-39 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Tue Jul 14 2020 Tom Stellard - 1.1-38 - Use make macros - https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro From db6004dafa3aadf64890889d4099c8b7d8a9cd3c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jul 2020 23:46:55 +0000 Subject: [PATCH 38/56] - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- abe.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/abe.spec b/abe.spec index 9ae0ef4..2eae0b1 100644 --- a/abe.spec +++ b/abe.spec @@ -1,6 +1,6 @@ Name: abe Version: 1.1 -Release: 39%{?dist} +Release: 40%{?dist} Summary: Scrolling, platform-jumping, ancient pyramid exploring game License: GPL+ @@ -89,6 +89,10 @@ desktop-file-install --dir $RPM_BUILD_ROOT/%{_datadir}/applications/ %{name}.des %{_datadir}/icons/hicolor/*/apps/%{name}.png %changelog +* Fri Jul 31 2020 Fedora Release Engineering - 1.1-40 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Mon Jul 27 2020 Fedora Release Engineering - 1.1-39 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 56611b7d2cecede790e538e802220c5bbc14e997 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Tue, 15 Dec 2020 01:40:47 +0000 Subject: [PATCH 39/56] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- abe.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/abe.spec b/abe.spec index 2eae0b1..e65b52c 100644 --- a/abe.spec +++ b/abe.spec @@ -29,6 +29,7 @@ BuildRequires: libXi-devel BuildRequires: libXmu-devel BuildRequires: SDL-devel BuildRequires: SDL_mixer-devel +BuildRequires: make Requires: hicolor-icon-theme From 1a1c2609e83cf7f016217a9cdc23e2f6bd0c29db Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 25 Jan 2021 23:43:23 +0000 Subject: [PATCH 40/56] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- abe.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abe.spec b/abe.spec index e65b52c..450f5c0 100644 --- a/abe.spec +++ b/abe.spec @@ -1,6 +1,6 @@ Name: abe Version: 1.1 -Release: 40%{?dist} +Release: 41%{?dist} Summary: Scrolling, platform-jumping, ancient pyramid exploring game License: GPL+ @@ -90,6 +90,9 @@ desktop-file-install --dir $RPM_BUILD_ROOT/%{_datadir}/applications/ %{name}.des %{_datadir}/icons/hicolor/*/apps/%{name}.png %changelog +* Mon Jan 25 2021 Fedora Release Engineering - 1.1-41 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Fri Jul 31 2020 Fedora Release Engineering - 1.1-40 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From f06be5bf571331bab8b1ac4acb9d795e765c274b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 12:15:16 +0000 Subject: [PATCH 41/56] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering From 86b98b0b262890dca007b68b60371a69c84a40e7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 17:10:22 +0000 Subject: [PATCH 42/56] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- abe.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abe.spec b/abe.spec index 450f5c0..94c51dc 100644 --- a/abe.spec +++ b/abe.spec @@ -1,6 +1,6 @@ Name: abe Version: 1.1 -Release: 41%{?dist} +Release: 42%{?dist} Summary: Scrolling, platform-jumping, ancient pyramid exploring game License: GPL+ @@ -90,6 +90,9 @@ desktop-file-install --dir $RPM_BUILD_ROOT/%{_datadir}/applications/ %{name}.des %{_datadir}/icons/hicolor/*/apps/%{name}.png %changelog +* Wed Jul 21 2021 Fedora Release Engineering - 1.1-42 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Mon Jan 25 2021 Fedora Release Engineering - 1.1-41 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 0a86662498ec9dbca4e928a9204eda3f19db2212 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jan 2022 20:50:13 +0000 Subject: [PATCH 43/56] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- abe.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abe.spec b/abe.spec index 94c51dc..90d90cf 100644 --- a/abe.spec +++ b/abe.spec @@ -1,6 +1,6 @@ Name: abe Version: 1.1 -Release: 42%{?dist} +Release: 43%{?dist} Summary: Scrolling, platform-jumping, ancient pyramid exploring game License: GPL+ @@ -90,6 +90,9 @@ desktop-file-install --dir $RPM_BUILD_ROOT/%{_datadir}/applications/ %{name}.des %{_datadir}/icons/hicolor/*/apps/%{name}.png %changelog +* Wed Jan 19 2022 Fedora Release Engineering - 1.1-43 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Wed Jul 21 2021 Fedora Release Engineering - 1.1-42 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 38b526e53dd5644090d52e119c7abbf3e6675686 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 20 Jul 2022 20:20:53 +0000 Subject: [PATCH 44/56] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- abe.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abe.spec b/abe.spec index 90d90cf..671b31e 100644 --- a/abe.spec +++ b/abe.spec @@ -1,6 +1,6 @@ Name: abe Version: 1.1 -Release: 43%{?dist} +Release: 44%{?dist} Summary: Scrolling, platform-jumping, ancient pyramid exploring game License: GPL+ @@ -90,6 +90,9 @@ desktop-file-install --dir $RPM_BUILD_ROOT/%{_datadir}/applications/ %{name}.des %{_datadir}/icons/hicolor/*/apps/%{name}.png %changelog +* Wed Jul 20 2022 Fedora Release Engineering - 1.1-44 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Wed Jan 19 2022 Fedora Release Engineering - 1.1-43 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 6dadca94de3eac82aec00e87196674ac31884139 Mon Sep 17 00:00:00 2001 From: Peter Fordham Date: Tue, 6 Dec 2022 07:08:47 +0000 Subject: [PATCH 45/56] Port configure script to C99. https://fedoraproject.org/wiki/Toolchain/PortingToModernC Rebuilding configure with new autotools would also solve the problem. --- abe-1.1-configure-c99.patch | 31 +++++++++++++++++++++++++++++++ abe.spec | 7 ++++++- 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 abe-1.1-configure-c99.patch diff --git a/abe-1.1-configure-c99.patch b/abe-1.1-configure-c99.patch new file mode 100644 index 0000000..581e6cd --- /dev/null +++ b/abe-1.1-configure-c99.patch @@ -0,0 +1,31 @@ +--- configure ++++ configure +@@ -960,7 +960,7 @@ cat > conftest.$ac_ext << EOF + #line 961 "configure" + #include "confdefs.h" + +-main(){return(0);} ++int main(){return(0);} + EOF + if { (eval echo configure:966: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + ac_cv_prog_cc_works=yes +@@ -1418,8 +1418,8 @@ else + #define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) + #define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) + int main () { int i; for (i = 0; i < 256; i++) +-if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); +-exit (0); } ++if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) return 2; ++return 0; } + + EOF + if { (eval echo configure:1426: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +@@ -2031,7 +2031,7 @@ if test "$ac_x_libraries" = NO; then + cat > conftest.$ac_ext < + int main() { + ${x_direct_test_function}() + ; return 0; } diff --git a/abe.spec b/abe.spec index 671b31e..e4a9dd7 100644 --- a/abe.spec +++ b/abe.spec @@ -1,6 +1,6 @@ Name: abe Version: 1.1 -Release: 44%{?dist} +Release: 45%{?dist} Summary: Scrolling, platform-jumping, ancient pyramid exploring game License: GPL+ @@ -22,6 +22,7 @@ Patch2: %{name}-1.1-format.patch Patch3: %{name}-1.1-aarch64.patch # Fix build failure with -Werror=format-security Patch4: %{name}-1.1-format-security.patch +Patch5: %{name}-1.1-configure-c99.patch BuildRequires: desktop-file-utils BuildRequires: gcc-c++ @@ -44,6 +45,7 @@ vaguely in the style of similar games for the Commodore+4. %patch2 %patch3 %patch4 +%patch5 # Fix the FSF's address sed 's/59 Temple Place, Suite 330, Boston, MA 02111-1307/51 Franklin Street, Suite 500, Boston, MA 02110-1335/' COPYING > COPYING.new @@ -90,6 +92,9 @@ desktop-file-install --dir $RPM_BUILD_ROOT/%{_datadir}/applications/ %{name}.des %{_datadir}/icons/hicolor/*/apps/%{name}.png %changelog +* Tue Dec 06 2022 Peter Fordham - 1.1-45 +- Port configure script to C99 + * Wed Jul 20 2022 Fedora Release Engineering - 1.1-44 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 5dcd4e367575008641be6aee14ac03f6750ec94a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 18 Jan 2023 21:18:33 +0000 Subject: [PATCH 46/56] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- abe.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abe.spec b/abe.spec index e4a9dd7..694630a 100644 --- a/abe.spec +++ b/abe.spec @@ -1,6 +1,6 @@ Name: abe Version: 1.1 -Release: 45%{?dist} +Release: 46%{?dist} Summary: Scrolling, platform-jumping, ancient pyramid exploring game License: GPL+ @@ -92,6 +92,9 @@ desktop-file-install --dir $RPM_BUILD_ROOT/%{_datadir}/applications/ %{name}.des %{_datadir}/icons/hicolor/*/apps/%{name}.png %changelog +* Wed Jan 18 2023 Fedora Release Engineering - 1.1-46 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Tue Dec 06 2022 Peter Fordham - 1.1-45 - Port configure script to C99 From 2ed1589cd84a8715b11bb9d31cf10924573bf19d Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Wed, 8 Mar 2023 14:50:28 -0600 Subject: [PATCH 47/56] migrated to SPDX license --- abe.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/abe.spec b/abe.spec index 694630a..095e087 100644 --- a/abe.spec +++ b/abe.spec @@ -1,9 +1,9 @@ Name: abe Version: 1.1 -Release: 46%{?dist} +Release: 47%{?dist} Summary: Scrolling, platform-jumping, ancient pyramid exploring game -License: GPL+ +License: GPL-1.0-or-later URL: http://abe.sourceforge.net/ Source0: http://downloads.sourceforge.net/abe/%{name}-%{version}.tar.gz Source1: %{name}-icons.tar.xz @@ -92,6 +92,9 @@ desktop-file-install --dir $RPM_BUILD_ROOT/%{_datadir}/applications/ %{name}.des %{_datadir}/icons/hicolor/*/apps/%{name}.png %changelog +* Wed Mar 08 2023 Gwyn Ciesla - 1.1-47 +- migrated to SPDX license + * Wed Jan 18 2023 Fedora Release Engineering - 1.1-46 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From a58812aca8012d7506b2c86fe264945872bd44c5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 12:48:28 +0000 Subject: [PATCH 48/56] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- abe.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abe.spec b/abe.spec index 095e087..261cc4e 100644 --- a/abe.spec +++ b/abe.spec @@ -1,6 +1,6 @@ Name: abe Version: 1.1 -Release: 47%{?dist} +Release: 48%{?dist} Summary: Scrolling, platform-jumping, ancient pyramid exploring game License: GPL-1.0-or-later @@ -92,6 +92,9 @@ desktop-file-install --dir $RPM_BUILD_ROOT/%{_datadir}/applications/ %{name}.des %{_datadir}/icons/hicolor/*/apps/%{name}.png %changelog +* Wed Jul 19 2023 Fedora Release Engineering - 1.1-48 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Wed Mar 08 2023 Gwyn Ciesla - 1.1-47 - migrated to SPDX license From 48001910844d1d9a58e76beec47da31b3d6658e2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 12:00:19 +0000 Subject: [PATCH 49/56] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- abe.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abe.spec b/abe.spec index 261cc4e..cf5d5d9 100644 --- a/abe.spec +++ b/abe.spec @@ -1,6 +1,6 @@ Name: abe Version: 1.1 -Release: 48%{?dist} +Release: 49%{?dist} Summary: Scrolling, platform-jumping, ancient pyramid exploring game License: GPL-1.0-or-later @@ -92,6 +92,9 @@ desktop-file-install --dir $RPM_BUILD_ROOT/%{_datadir}/applications/ %{name}.des %{_datadir}/icons/hicolor/*/apps/%{name}.png %changelog +* Fri Jan 19 2024 Fedora Release Engineering - 1.1-49 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Wed Jul 19 2023 Fedora Release Engineering - 1.1-48 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 28bafb957d5c2db47278c066e38b171a1eeedf31 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 22 Jan 2024 22:33:20 +0000 Subject: [PATCH 50/56] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- abe.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abe.spec b/abe.spec index cf5d5d9..9ec8dc3 100644 --- a/abe.spec +++ b/abe.spec @@ -1,6 +1,6 @@ Name: abe Version: 1.1 -Release: 49%{?dist} +Release: 50%{?dist} Summary: Scrolling, platform-jumping, ancient pyramid exploring game License: GPL-1.0-or-later @@ -92,6 +92,9 @@ desktop-file-install --dir $RPM_BUILD_ROOT/%{_datadir}/applications/ %{name}.des %{_datadir}/icons/hicolor/*/apps/%{name}.png %changelog +* Mon Jan 22 2024 Fedora Release Engineering - 1.1-50 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 19 2024 Fedora Release Engineering - 1.1-49 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From fc7d9247145e79270ceda904f0fae0cb4675dc25 Mon Sep 17 00:00:00 2001 From: Software Management Team Date: Thu, 30 May 2024 12:46:46 +0200 Subject: [PATCH 51/56] Eliminate use of obsolete %patchN syntax (#2283636) --- abe.spec | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/abe.spec b/abe.spec index 9ec8dc3..9341ef5 100644 --- a/abe.spec +++ b/abe.spec @@ -40,12 +40,12 @@ vaguely in the style of similar games for the Commodore+4. %prep %setup -q -%patch0 -%patch1 -%patch2 -%patch3 -%patch4 -%patch5 +%patch -P0 +%patch -P1 +%patch -P2 +%patch -P3 +%patch -P4 +%patch -P5 # Fix the FSF's address sed 's/59 Temple Place, Suite 330, Boston, MA 02111-1307/51 Franklin Street, Suite 500, Boston, MA 02110-1335/' COPYING > COPYING.new From ba84c284859269abdaf99aa0b31e0ac047eb40df Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 16:29:53 +0000 Subject: [PATCH 52/56] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- abe.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abe.spec b/abe.spec index 9341ef5..802727f 100644 --- a/abe.spec +++ b/abe.spec @@ -1,6 +1,6 @@ Name: abe Version: 1.1 -Release: 50%{?dist} +Release: 51%{?dist} Summary: Scrolling, platform-jumping, ancient pyramid exploring game License: GPL-1.0-or-later @@ -92,6 +92,9 @@ desktop-file-install --dir $RPM_BUILD_ROOT/%{_datadir}/applications/ %{name}.des %{_datadir}/icons/hicolor/*/apps/%{name}.png %changelog +* Wed Jul 17 2024 Fedora Release Engineering - 1.1-51 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Mon Jan 22 2024 Fedora Release Engineering - 1.1-50 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From c9296b1cb0135b8e7ad1e9ac693fd6fe9cb18cbd Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Wed, 8 Jan 2025 15:38:11 -0600 Subject: [PATCH 53/56] Patch for gcc15 --- abe-finishdrawmap.patch | 11 +++++++++++ abe.spec | 7 ++++++- 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 abe-finishdrawmap.patch diff --git a/abe-finishdrawmap.patch b/abe-finishdrawmap.patch new file mode 100644 index 0000000..4e06948 --- /dev/null +++ b/abe-finishdrawmap.patch @@ -0,0 +1,11 @@ +--- src/Map.c~ 2005-03-05 10:20:04.000000000 -0600 ++++ src/Map.c 2025-01-08 15:30:08.904971564 -0600 +@@ -945,7 +945,7 @@ + drawMap(); // this calls finishDrawMap + } else { + // update the screen +- finishDrawMap(!map.redraw); ++ finishDrawMap(); + } + + // uncomment to test slow machine game speed diff --git a/abe.spec b/abe.spec index 802727f..5e61bc1 100644 --- a/abe.spec +++ b/abe.spec @@ -1,6 +1,6 @@ Name: abe Version: 1.1 -Release: 51%{?dist} +Release: 52%{?dist} Summary: Scrolling, platform-jumping, ancient pyramid exploring game License: GPL-1.0-or-later @@ -23,6 +23,7 @@ Patch3: %{name}-1.1-aarch64.patch # Fix build failure with -Werror=format-security Patch4: %{name}-1.1-format-security.patch Patch5: %{name}-1.1-configure-c99.patch +Patch6: %{name}-finishdrawmap.patch BuildRequires: desktop-file-utils BuildRequires: gcc-c++ @@ -46,6 +47,7 @@ vaguely in the style of similar games for the Commodore+4. %patch -P3 %patch -P4 %patch -P5 +%patch -P6 # Fix the FSF's address sed 's/59 Temple Place, Suite 330, Boston, MA 02111-1307/51 Franklin Street, Suite 500, Boston, MA 02110-1335/' COPYING > COPYING.new @@ -92,6 +94,9 @@ desktop-file-install --dir $RPM_BUILD_ROOT/%{_datadir}/applications/ %{name}.des %{_datadir}/icons/hicolor/*/apps/%{name}.png %changelog +* Wed Jan 08 2025 Gwyn Ciesla - 1.1-52 +- Patch for GCC 15 + * Wed Jul 17 2024 Fedora Release Engineering - 1.1-51 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From a91d4b5dfd6255e58797054889598db4554433c8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 10:27:52 +0000 Subject: [PATCH 54/56] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- abe.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abe.spec b/abe.spec index 5e61bc1..b2dcf39 100644 --- a/abe.spec +++ b/abe.spec @@ -1,6 +1,6 @@ Name: abe Version: 1.1 -Release: 52%{?dist} +Release: 53%{?dist} Summary: Scrolling, platform-jumping, ancient pyramid exploring game License: GPL-1.0-or-later @@ -94,6 +94,9 @@ desktop-file-install --dir $RPM_BUILD_ROOT/%{_datadir}/applications/ %{name}.des %{_datadir}/icons/hicolor/*/apps/%{name}.png %changelog +* Thu Jan 16 2025 Fedora Release Engineering - 1.1-53 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Wed Jan 08 2025 Gwyn Ciesla - 1.1-52 - Patch for GCC 15 From 6bd1ebc5df7d8b7e2955f21de46089190f52b982 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 16:41:56 +0000 Subject: [PATCH 55/56] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- abe.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abe.spec b/abe.spec index b2dcf39..de28a4f 100644 --- a/abe.spec +++ b/abe.spec @@ -1,6 +1,6 @@ Name: abe Version: 1.1 -Release: 53%{?dist} +Release: 54%{?dist} Summary: Scrolling, platform-jumping, ancient pyramid exploring game License: GPL-1.0-or-later @@ -94,6 +94,9 @@ desktop-file-install --dir $RPM_BUILD_ROOT/%{_datadir}/applications/ %{name}.des %{_datadir}/icons/hicolor/*/apps/%{name}.png %changelog +* Wed Jul 23 2025 Fedora Release Engineering - 1.1-54 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Thu Jan 16 2025 Fedora Release Engineering - 1.1-53 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From eb8b720b40739b93895a926e61586dd497a54624 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 16 Jan 2026 03:23:16 +0000 Subject: [PATCH 56/56] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- abe.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abe.spec b/abe.spec index de28a4f..fe1259a 100644 --- a/abe.spec +++ b/abe.spec @@ -1,6 +1,6 @@ Name: abe Version: 1.1 -Release: 54%{?dist} +Release: 55%{?dist} Summary: Scrolling, platform-jumping, ancient pyramid exploring game License: GPL-1.0-or-later @@ -94,6 +94,9 @@ desktop-file-install --dir $RPM_BUILD_ROOT/%{_datadir}/applications/ %{name}.des %{_datadir}/icons/hicolor/*/apps/%{name}.png %changelog +* Fri Jan 16 2026 Fedora Release Engineering - 1.1-55 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Wed Jul 23 2025 Fedora Release Engineering - 1.1-54 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild