diff --git a/bug-841457_make-savannah-bug30612-handling_of_archives-part2.txt b/bug-841457_make-savannah-bug30612-handling_of_archives-part2.txt
deleted file mode 100644
index 465a74c..0000000
--- a/bug-841457_make-savannah-bug30612-handling_of_archives-part2.txt
+++ /dev/null
@@ -1,45 +0,0 @@
-diff --git a/read.c b/read.c
-index 8587e85..370009d 100644
---- a/read.c
-+++ b/read.c
-@@ -3047,16 +3047,16 @@ parse_file_seq (char **stringp, unsigned int size, int stopchar,
- nlen -= (n + 1) - tp;
- tp = n + 1;
-
-- /* If we have just "lib(", part of something like
-- "lib( a b)", go to the next item. */
-- if (! nlen)
-- continue;
--
- /* We can stop looking now. */
- break;
- }
- }
- while (*e != '\0');
-+
-+ /* If we have just "lib(", part of something like "lib( a b)",
-+ go to the next item. */
-+ if (! nlen)
-+ continue;
- }
- }
-
-diff --git a/tests/scripts/features/archives b/tests/scripts/features/archives
-index 00aa1af..3fe46a0 100644
---- a/tests/scripts/features/archives
-+++ b/tests/scripts/features/archives
-@@ -36,6 +36,11 @@ utouch(-50, 'a2.o');
- run_make_test('all: libxx.a(a3.o *.o)', '',
- "ar rv libxx.a a3.o\na - a3.o\nar rv libxx.a a2.o\nr - a2.o\n");
-
-+# Check whitespace handling
-+utouch(-40, 'a2.o');
-+run_make_test('all: libxx.a( a3.o *.o )', '',
-+ "ar rv libxx.a a2.o\nr - a2.o\n");
-+
- rmfiles(qw(a1.o a2.o a3.o libxx.a));
-
- # This tells the test driver that the perl test script executed properly.
---
-1.8.4
-
diff --git a/config-guess-update.diff b/config-guess-update.diff
deleted file mode 100644
index 4af76f6..0000000
--- a/config-guess-update.diff
+++ /dev/null
@@ -1,1226 +0,0 @@
---- config/config.guess
-+++ config/config.guess
-@@ -1,14 +1,14 @@
- #! /bin/sh
- # Attempt to guess a canonical system name.
- # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
--# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
--# Free Software Foundation, Inc.
-+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-+# 2011, 2012, 2013 Free Software Foundation, Inc.
-
--timestamp='2010-04-03'
-+timestamp='2012-12-30'
-
- # This file is free software; you can redistribute it and/or modify it
- # under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2 of the License, or
-+# the Free Software Foundation; either version 3 of the License, or
- # (at your option) any later version.
- #
- # This program is distributed in the hope that it will be useful, but
-@@ -17,26 +17,22 @@
- # General Public License for more details.
- #
- # You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
--# 02110-1301, USA.
-+# along with this program; if not, see .
- #
- # As a special exception to the GNU General Public License, if you
- # distribute this file as part of a program that contains a
- # configuration script generated by Autoconf, you may include it under
--# the same distribution terms that you use for the rest of that program.
--
--
--# Originally written by Per Bothner. Please send patches (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.
-+# Originally written by Per Bothner.
- #
- # 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,.*/,,'`
-
-@@ -57,8 +53,8 @@
-
- Originally written by Per Bothner.
- Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
--2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
--Software Foundation, Inc.
-+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
-+2012, 2013 Free Software Foundation, Inc.
-
- This is free software; see the source for copying conditions. There is NO
- warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-@@ -92,7 +88,7 @@
- exit 1
- fi
-
--trap 'exit 1' HUP INT TERM
-+trap '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
-@@ -106,7 +102,7 @@
-
- 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" HUP INT PIPE TERM ;
-+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) ; } ||
-@@ -145,7 +141,7 @@
- case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
- *:NetBSD:*:*)
- # NetBSD (nbsd) targets should (where applicable) match one or
-- # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
-+ # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
- # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently
- # switched to ELF, *-*-netbsd* would select the old
- # object file format. This provides both forward
-@@ -181,7 +177,7 @@
- fi
- ;;
- *)
-- os=netbsd
-+ os=netbsd
- ;;
- esac
- # The OS release
-@@ -202,6 +198,10 @@
- # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
- echo "${machine}-${os}${release}"
- 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}
-@@ -224,7 +224,7 @@
- UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
- ;;
- *5.*)
-- UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
-+ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
- ;;
- esac
- # According to Compaq, /usr/sbin/psrinfo has been available on
-@@ -270,7 +270,10 @@
- # A Xn.n version is an unreleased experimental baselevel.
- # 1.2 uses "1.2" for uname -r.
- echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-- exit ;;
-+ # 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
-@@ -296,12 +299,12 @@
- echo s390-ibm-zvmoe
- exit ;;
- *:OS400:*:*)
-- echo powerpc-ibm-os400
-+ echo powerpc-ibm-os400
- exit ;;
- arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
- echo arm-acorn-riscix${UNAME_RELEASE}
- exit ;;
-- arm:riscos:*:*|arm:RISCOS:*:*)
-+ arm*:riscos:*:*|arm*:RISCOS:*:*)
- echo arm-unknown-riscos
- exit ;;
- SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
-@@ -395,23 +398,23 @@
- # 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}
-+ echo m68k-atari-mint${UNAME_RELEASE}
- exit ;;
- atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
- echo m68k-atari-mint${UNAME_RELEASE}
-- exit ;;
-+ exit ;;
- *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-- echo m68k-atari-mint${UNAME_RELEASE}
-+ echo m68k-atari-mint${UNAME_RELEASE}
- exit ;;
- milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-- echo m68k-milan-mint${UNAME_RELEASE}
-- exit ;;
-+ echo m68k-milan-mint${UNAME_RELEASE}
-+ exit ;;
- hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-- echo m68k-hades-mint${UNAME_RELEASE}
-- exit ;;
-+ echo m68k-hades-mint${UNAME_RELEASE}
-+ exit ;;
- *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-- echo m68k-unknown-mint${UNAME_RELEASE}
-- exit ;;
-+ echo m68k-unknown-mint${UNAME_RELEASE}
-+ exit ;;
- m68k:machten:*:*)
- echo m68k-apple-machten${UNAME_RELEASE}
- exit ;;
-@@ -481,8 +484,8 @@
- echo m88k-motorola-sysv3
- 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 ] || \
-@@ -495,7 +498,7 @@
- else
- echo i586-dg-dgux${UNAME_RELEASE}
- fi
-- exit ;;
-+ exit ;;
- M88*:DolphinOS:*:*) # DolphinOS (SVR3)
- echo m88k-dolphin-sysv3
- exit ;;
-@@ -552,7 +555,7 @@
- echo rs6000-ibm-aix3.2
- fi
- exit ;;
-- *:AIX:*:[456])
-+ *: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
-@@ -595,52 +598,52 @@
- 9000/[678][0-9][0-9])
- if [ -x /usr/bin/getconf ]; then
- sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
-- sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
-- case "${sc_cpu_version}" in
-- 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-- 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
-- 532) # CPU_PA_RISC2_0
-- case "${sc_kernel_bits}" in
-- 32) HP_ARCH="hppa2.0n" ;;
-- 64) HP_ARCH="hppa2.0w" ;;
-+ sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
-+ case "${sc_cpu_version}" in
-+ 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-+ 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
-+ 532) # CPU_PA_RISC2_0
-+ case "${sc_kernel_bits}" in
-+ 32) HP_ARCH="hppa2.0n" ;;
-+ 64) HP_ARCH="hppa2.0w" ;;
- '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20
-- esac ;;
-- esac
-+ esac ;;
-+ esac
- fi
- if [ "${HP_ARCH}" = "" ]; then
- eval $set_cc_for_build
-- sed 's/^ //' << EOF >$dummy.c
-+ sed 's/^ //' << EOF >$dummy.c
-+
-+ #define _HPUX_SOURCE
-+ #include
-+ #include
-
-- #define _HPUX_SOURCE
-- #include
-- #include
--
-- int main ()
-- {
-- #if defined(_SC_KERNEL_BITS)
-- long bits = sysconf(_SC_KERNEL_BITS);
-- #endif
-- long cpu = sysconf (_SC_CPU_VERSION);
--
-- switch (cpu)
-- {
-- case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
-- case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
-- case CPU_PA_RISC2_0:
-- #if defined(_SC_KERNEL_BITS)
-- switch (bits)
-- {
-- case 64: puts ("hppa2.0w"); break;
-- case 32: puts ("hppa2.0n"); break;
-- default: puts ("hppa2.0"); break;
-- } break;
-- #else /* !defined(_SC_KERNEL_BITS) */
-- puts ("hppa2.0"); break;
-- #endif
-- default: puts ("hppa1.0"); break;
-- }
-- exit (0);
-- }
-+ int main ()
-+ {
-+ #if defined(_SC_KERNEL_BITS)
-+ long bits = sysconf(_SC_KERNEL_BITS);
-+ #endif
-+ long cpu = sysconf (_SC_CPU_VERSION);
-+
-+ switch (cpu)
-+ {
-+ case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
-+ case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
-+ case CPU_PA_RISC2_0:
-+ #if defined(_SC_KERNEL_BITS)
-+ switch (bits)
-+ {
-+ case 64: puts ("hppa2.0w"); break;
-+ case 32: puts ("hppa2.0n"); break;
-+ default: puts ("hppa2.0"); break;
-+ } break;
-+ #else /* !defined(_SC_KERNEL_BITS) */
-+ puts ("hppa2.0"); break;
-+ #endif
-+ default: puts ("hppa1.0"); break;
-+ }
-+ exit (0);
-+ }
- EOF
- (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
- test -z "$HP_ARCH" && HP_ARCH=hppa
-@@ -731,22 +734,22 @@
- exit ;;
- C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
- echo c1-convex-bsd
-- exit ;;
-+ exit ;;
- C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
- if getsysinfo -f scalar_acc
- then echo c32-convex-bsd
- else echo c2-convex-bsd
- fi
-- exit ;;
-+ exit ;;
- C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
- echo c34-convex-bsd
-- exit ;;
-+ exit ;;
- C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
- echo c38-convex-bsd
-- exit ;;
-+ exit ;;
- C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
- echo c4-convex-bsd
-- exit ;;
-+ exit ;;
- CRAY*Y-MP:*:*:*)
- echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
- exit ;;
-@@ -770,14 +773,14 @@
- 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 ;;
-+ 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}"
-+ 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}
-@@ -789,30 +792,35 @@
- echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
- exit ;;
- *:FreeBSD:*:*)
-- case ${UNAME_MACHINE} in
-- pc98)
-- echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-+ UNAME_PROCESSOR=`/usr/bin/uname -p`
-+ case ${UNAME_PROCESSOR} in
- amd64)
- echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
- *)
-- echo ${UNAME_MACHINE}-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 ;;
-+ *:MINGW64*:*)
-+ echo ${UNAME_MACHINE}-pc-mingw64
-+ exit ;;
- *:MINGW*:*)
- echo ${UNAME_MACHINE}-pc-mingw32
- exit ;;
-+ i*:MSYS*:*)
-+ echo ${UNAME_MACHINE}-pc-msys
-+ exit ;;
- i*:windows32*:*)
-- # uname -m includes "-pc" on this system.
-- echo ${UNAME_MACHINE}-mingw32
-+ # uname -m includes "-pc" on this system.
-+ echo ${UNAME_MACHINE}-mingw32
- exit ;;
- i*:PW*:*)
- echo ${UNAME_MACHINE}-pc-pw32
- exit ;;
- *:Interix*:*)
-- case ${UNAME_MACHINE} in
-+ case ${UNAME_MACHINE} in
- x86)
- echo i586-pc-interix${UNAME_RELEASE}
- exit ;;
-@@ -858,6 +866,13 @@
- i*86:Minix:*:*)
- echo ${UNAME_MACHINE}-pc-minix
- exit ;;
-+ aarch64:Linux:*:*)
-+ echo ${UNAME_MACHINE}-unknown-linux-gnu
-+ exit ;;
-+ aarch64_be:Linux:*:*)
-+ UNAME_MACHINE=aarch64_be
-+ echo ${UNAME_MACHINE}-unknown-linux-gnu
-+ exit ;;
- alpha:Linux:*:*)
- case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
- EV5) UNAME_MACHINE=alphaev5 ;;
-@@ -867,7 +882,7 @@
- EV6) UNAME_MACHINE=alphaev6 ;;
- EV67) UNAME_MACHINE=alphaev67 ;;
- EV68*) UNAME_MACHINE=alphaev68 ;;
-- esac
-+ 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}
-@@ -879,20 +894,29 @@
- then
- echo ${UNAME_MACHINE}-unknown-linux-gnu
- else
-- echo ${UNAME_MACHINE}-unknown-linux-gnueabi
-+ 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 cris-axis-linux-gnu
-+ echo ${UNAME_MACHINE}-axis-linux-gnu
- exit ;;
- crisv32:Linux:*:*)
-- echo crisv32-axis-linux-gnu
-+ echo ${UNAME_MACHINE}-axis-linux-gnu
- exit ;;
- frv:Linux:*:*)
-- echo frv-unknown-linux-gnu
-+ echo ${UNAME_MACHINE}-unknown-linux-gnu
-+ exit ;;
-+ hexagon:Linux:*:*)
-+ echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit ;;
- i*86:Linux:*:*)
- LIBC=gnu
-@@ -934,7 +958,7 @@
- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
- ;;
- or32:Linux:*:*)
-- echo or32-unknown-linux-gnu
-+ echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit ;;
- padre:Linux:*:*)
- echo sparc-unknown-linux-gnu
-@@ -960,7 +984,7 @@
- echo ${UNAME_MACHINE}-ibm-linux
- exit ;;
- sh64*:Linux:*:*)
-- echo ${UNAME_MACHINE}-unknown-linux-gnu
-+ echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit ;;
- sh*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
-@@ -968,14 +992,17 @@
- sparc:Linux:*:* | sparc64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
- 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
-+ echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit ;;
- xtensa*:Linux:*:*)
-- echo ${UNAME_MACHINE}-unknown-linux-gnu
-+ echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit ;;
- i*86:DYNIX/ptx:4*:*)
- # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
-@@ -984,11 +1011,11 @@
- echo i386-sequent-sysv4
- 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 ;;
- i*86:OS/2:*:*)
-@@ -1020,7 +1047,7 @@
- fi
- exit ;;
- i*86:*:5:[678]*)
-- # UnixWare 7.x, OpenUNIX and OpenServer 6.
-+ # UnixWare 7.x, OpenUNIX and OpenServer 6.
- case `/bin/uname -X | grep "^Machine"` in
- *486*) UNAME_MACHINE=i486 ;;
- *Pentium) UNAME_MACHINE=i586 ;;
-@@ -1048,13 +1075,13 @@
- 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 i586.
-+ # 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 ;;
-+ exit ;;
- Intel:Mach:3*:*)
- echo i386-pc-mach3
- exit ;;
-@@ -1089,8 +1116,8 @@
- /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
- && { 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; } ;;
-+ /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 \
-@@ -1133,10 +1160,10 @@
- echo ns32k-sni-sysv
- fi
- exit ;;
-- PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-- # says
-- echo i586-unisys-sysv4
-- 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
-@@ -1162,11 +1189,11 @@
- 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 ;;
-+ exit ;;
- BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only.
- echo powerpc-be-beos
- exit ;;
-@@ -1179,6 +1206,9 @@
- 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 ;;
-@@ -1231,7 +1261,10 @@
- *:QNX:*:4*)
- echo i386-pc-qnx
- exit ;;
-- NSE-?:NONSTOP_KERNEL:*:*)
-+ NEO-?:NONSTOP_KERNEL:*:*)
-+ echo neo-tandem-nsk${UNAME_RELEASE}
-+ exit ;;
-+ NSE-*:NONSTOP_KERNEL:*:*)
- echo nse-tandem-nsk${UNAME_RELEASE}
- exit ;;
- NSR-?:NONSTOP_KERNEL:*:*)
-@@ -1276,13 +1309,13 @@
- echo pdp10-unknown-its
- exit ;;
- SEI:*:*:SEIUX)
-- echo mips-sei-seiux${UNAME_RELEASE}
-+ 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`
-+ UNAME_MACHINE=`(uname -p) 2>/dev/null`
- case "${UNAME_MACHINE}" in
- A*) echo alpha-dec-vms ; exit ;;
- I*) echo ia64-dec-vms ; exit ;;
-@@ -1300,11 +1333,11 @@
- 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
-
---- config/config.sub
-+++ config/config.sub
-@@ -1,38 +1,33 @@
- #! /bin/sh
- # Configuration validation subroutine script.
- # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
--# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
--# Free Software Foundation, Inc.
-+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-+# 2011, 2012, 2013 Free Software Foundation, Inc.
-
--timestamp='2010-05-21'
-+timestamp='2013-01-23'
-
--# This file is (in principle) common to ALL GNU software.
--# The presence of a machine in this file suggests that SOME GNU software
--# can handle that machine. It does not imply ALL GNU software can.
--#
--# This file is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2 of the License, or
-+# This file is free software; you can redistribute it and/or modify it
-+# under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 3 of the License, or
- # (at your option) any later version.
- #
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
--# GNU General Public License for more details.
-+# This program is distributed in the hope that it will be useful, but
-+# WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+# General Public License for more details.
- #
- # You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
--# 02110-1301, USA.
-+# along with this program; if not, see .
- #
- # As a special exception to the GNU General Public License, if you
- # distribute this file as part of a program that contains a
- # configuration script generated by Autoconf, you may include it under
--# the same distribution terms that you use for the rest of that program.
-+# the same distribution terms that you use for the rest of that
-+# program. This Exception is an additional permission under section 7
-+# of the GNU General Public License, version 3 ("GPLv3").
-
-
--# Please send patches to . Submit a context
--# diff and a properly formatted 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.
-@@ -76,8 +71,8 @@
- GNU config.sub ($timestamp)
-
- Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
--2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
--Software Foundation, Inc.
-+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
-+2012, 2013 Free Software Foundation, Inc.
-
- This is free software; see the source for copying conditions. There is NO
- warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-@@ -125,13 +120,17 @@
- maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
- case $maybe_os in
- nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
-- linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
-+ 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 ]
-@@ -154,12 +153,12 @@
- -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
- -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
- -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-- -apple | -axis | -knuth | -cray | -microblaze)
-+ -apple | -axis | -knuth | -cray | -microblaze*)
- os=
- basic_machine=$1
- ;;
-- -bluegene*)
-- os=-cnk
-+ -bluegene*)
-+ os=-cnk
- ;;
- -sim | -cisco | -oki | -wec | -winbond)
- os=
-@@ -175,10 +174,10 @@
- os=-chorusos
- basic_machine=$1
- ;;
-- -chorusrdb)
-- os=-chorusrdb
-+ -chorusrdb)
-+ os=-chorusrdb
- basic_machine=$1
-- ;;
-+ ;;
- -hiux*)
- os=-hiuxwe2
- ;;
-@@ -223,6 +222,12 @@
- -isc*)
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
- ;;
-+ -lynx*178)
-+ os=-lynxos178
-+ ;;
-+ -lynx*5)
-+ os=-lynxos5
-+ ;;
- -lynx*)
- os=-lynxos
- ;;
-@@ -247,20 +252,27 @@
- # Some are omitted here because they have special meanings below.
- 1750a | 580 \
- | a29k \
-+ | aarch64 | aarch64_be \
- | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
- | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
- | am33_2.0 \
-- | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
-+ | arc \
-+ | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
-+ | avr | avr32 \
-+ | be32 | be64 \
- | bfin \
- | c4x | clipper \
- | d10v | d30v | dlx | dsp16xx \
-+ | epiphany \
- | fido | fr30 | frv \
- | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
-+ | hexagon \
- | i370 | i860 | i960 | ia64 \
- | ip2k | iq2000 \
-+ | le32 | le64 \
- | lm32 \
- | m32c | m32r | m32rle | m68000 | m68k | m88k \
-- | maxq | mb | microblaze | mcore | mep | metag \
-+ | maxq | mb | microblaze | microblazeel | mcore | mep | metag \
- | mips | mipsbe | mipseb | mipsel | mipsle \
- | mips16 \
- | mips64 | mips64el \
-@@ -278,29 +290,32 @@
- | mipsisa64r2 | mipsisa64r2el \
- | mipsisa64sb1 | mipsisa64sb1el \
- | mipsisa64sr71k | mipsisa64sr71kel \
-+ | mipsr5900 | mipsr5900el \
- | mipstx39 | mipstx39el \
- | mn10200 | mn10300 \
- | moxie \
- | mt \
- | msp430 \
-- | nios | nios2 \
-+ | nds32 | nds32le | nds32be \
-+ | nios | nios2 | nios2eb | nios2el \
- | ns16k | ns32k \
-+ | open8 \
- | or32 \
- | pdp10 | pdp11 | pj | pjl \
-- | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
-+ | powerpc | powerpc64 | powerpc64le | powerpcle \
- | pyramid \
-- | rx \
-+ | 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 | strongarm \
-- | tahoe | thumb | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
-+ | spu \
-+ | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
- | ubicom32 \
-- | v850 | v850e \
-+ | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
- | we32k \
-- | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
-+ | x86 | xc16x | xstormy16 | xtensa \
- | z8k | z80)
- basic_machine=$basic_machine-unknown
- ;;
-@@ -313,8 +328,7 @@
- c6x)
- basic_machine=tic6x-unknown
- ;;
-- m6811 | m68hc11 | m6812 | m68hc12 | picochip)
-- # Motorola 68HC11/12.
-+ m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
- basic_machine=$basic_machine-unknown
- os=-none
- ;;
-@@ -324,6 +338,21 @@
- 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
- # (2) the word "unknown" tends to confuse beginning users.
-@@ -338,11 +367,13 @@
- # Recognize the basic CPU types with company name.
- 580-* \
- | a29k-* \
-+ | aarch64-* | aarch64_be-* \
- | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
- | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
- | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
- | arm-* | armbe-* | armle-* | armeb-* | armv*-* \
- | avr-* | avr32-* \
-+ | be32-* | be64-* \
- | bfin-* | bs2000-* \
- | c[123]* | c30-* | [cjt]90-* | c4x-* \
- | clipper-* | craynv-* | cydra-* \
-@@ -351,12 +382,15 @@
- | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
- | h8300-* | h8500-* \
- | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
-+ | hexagon-* \
- | i*86-* | i860-* | i960-* | ia64-* \
- | ip2k-* | iq2000-* \
-+ | le32-* | le64-* \
- | lm32-* \
- | m32c-* | m32r-* | m32rle-* \
- | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-- | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
-+ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
-+ | microblaze-* | microblazeel-* \
- | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
- | mips16-* \
- | mips64-* | mips64el-* \
-@@ -374,30 +408,34 @@
- | mipsisa64r2-* | mipsisa64r2el-* \
- | mipsisa64sb1-* | mipsisa64sb1el-* \
- | mipsisa64sr71k-* | mipsisa64sr71kel-* \
-+ | mipsr5900-* | mipsr5900el-* \
- | mipstx39-* | mipstx39el-* \
- | mmix-* \
- | mt-* \
- | msp430-* \
-- | nios-* | nios2-* \
-+ | nds32-* | nds32le-* | nds32be-* \
-+ | nios-* | nios2-* | nios2eb-* | nios2el-* \
- | none-* | np1-* | ns16k-* | ns32k-* \
-+ | open8-* \
- | orion-* \
- | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
-- | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
-+ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
- | pyramid-* \
-- | romp-* | rs6000-* | rx-* \
-+ | 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-* | strongarm-* | sv1-* | sx?-* \
-- | tahoe-* | thumb-* \
-+ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
-+ | tahoe-* \
- | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
-- | tile-* | tilegx-* \
-+ | tile*-* \
- | tron-* \
- | ubicom32-* \
-- | v850-* | v850e-* | vax-* \
-+ | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
-+ | vax-* \
- | we32k-* \
-- | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
-+ | x86-* | x86_64-* | xc16x-* | xps100-* \
- | xstormy16-* | xtensa*-* \
- | ymp-* \
- | z8k-* | z80-*)
-@@ -422,7 +460,7 @@
- basic_machine=a29k-amd
- os=-udi
- ;;
-- abacus)
-+ abacus)
- basic_machine=abacus-unknown
- ;;
- adobe68k)
-@@ -505,7 +543,7 @@
- basic_machine=c90-cray
- os=-unicos
- ;;
-- cegcc)
-+ cegcc)
- basic_machine=arm-unknown
- os=-cegcc
- ;;
-@@ -537,7 +575,7 @@
- basic_machine=craynv-cray
- os=-unicosmp
- ;;
-- cr16)
-+ cr16 | cr16-*)
- basic_machine=cr16-unknown
- os=-elf
- ;;
-@@ -695,7 +733,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
-@@ -753,9 +790,13 @@
- basic_machine=ns32k-utek
- os=-sysv
- ;;
-- microblaze)
-+ microblaze*)
- basic_machine=microblaze-xilinx
- ;;
-+ mingw64)
-+ basic_machine=x86_64-pc
-+ os=-mingw64
-+ ;;
- mingw32)
- basic_machine=i386-pc
- os=-mingw32
-@@ -792,10 +833,18 @@
- 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
-@@ -860,6 +909,12 @@
- np1)
- basic_machine=np1-gould
- ;;
-+ neo-tandem)
-+ basic_machine=neo-tandem
-+ ;;
-+ nse-tandem)
-+ basic_machine=nse-tandem
-+ ;;
- nsr-tandem)
- basic_machine=nsr-tandem
- ;;
-@@ -942,9 +997,10 @@
- ;;
- power) basic_machine=power-ibm
- ;;
-- ppc) basic_machine=powerpc-unknown
-+ ppc | ppcbe) basic_machine=powerpc-unknown
- ;;
-- ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
-+ ppc-* | ppcbe-*)
-+ basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
- ;;
- ppcle | powerpclittle | ppc-le | powerpc-little)
- basic_machine=powerpcle-unknown
-@@ -969,7 +1025,11 @@
- basic_machine=i586-unknown
- os=-pw32
- ;;
-- rdos)
-+ rdos | rdos64)
-+ basic_machine=x86_64-pc
-+ os=-rdos
-+ ;;
-+ rdos32)
- basic_machine=i386-pc
- os=-rdos
- ;;
-@@ -1038,6 +1098,9 @@
- basic_machine=i860-stratus
- os=-sysv4
- ;;
-+ strongarm-* | thumb-*)
-+ basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
-+ ;;
- sun2)
- basic_machine=m68000-sun
- ;;
-@@ -1094,13 +1157,8 @@
- basic_machine=t90-cray
- os=-unicos
- ;;
-- # This must be matched before tile*.
-- tilegx*)
-- basic_machine=tilegx-unknown
-- os=-linux-gnu
-- ;;
- tile*)
-- basic_machine=tile-unknown
-+ basic_machine=$basic_machine-unknown
- os=-linux-gnu
- ;;
- tx39)
-@@ -1170,6 +1228,9 @@
- xps | xps100)
- basic_machine=xps100-honeywell
- ;;
-+ xscale-* | xscalee[bl]-*)
-+ basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
-+ ;;
- ymp)
- basic_machine=ymp-cray
- os=-unicos
-@@ -1267,11 +1328,11 @@
- 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
-+ -auroraux)
-+ os=-auroraux
- ;;
- -solaris1 | -solaris1.*)
- os=`echo $os | sed -e 's|solaris1|sunos4|'`
-@@ -1295,21 +1356,21 @@
- -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
- | -*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* | -aros* \
- | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
- | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
- | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
-- | -openbsd* | -solidbsd* \
-+ | -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* | -cegcc* \
-- | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-- | -mingw32* | -linux-gnu* | -linux-android* \
-- | -linux-newlib* | -linux-uclibc* \
-+ | -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* \
-@@ -1356,7 +1417,7 @@
- -opened*)
- os=-openedition
- ;;
-- -os400*)
-+ -os400*)
- os=-os400
- ;;
- -wince*)
-@@ -1405,7 +1466,7 @@
- -sinix*)
- os=-sysv4
- ;;
-- -tpf*)
-+ -tpf*)
- os=-tpf
- ;;
- -triton*)
-@@ -1441,17 +1502,14 @@
- -aros*)
- os=-aros
- ;;
-- -kaos*)
-- os=-kaos
-- ;;
- -zvmoe)
- os=-zvmoe
- ;;
- -dicos*)
- os=-dicos
- ;;
-- -nacl*)
-- ;;
-+ -nacl*)
-+ ;;
- -none)
- ;;
- *)
-@@ -1474,10 +1532,10 @@
- # system, and we'll never get to this point.
-
- case $basic_machine in
-- score-*)
-+ score-*)
- os=-elf
- ;;
-- spu-*)
-+ spu-*)
- os=-elf
- ;;
- *-acorn)
-@@ -1489,8 +1547,11 @@
- arm*-semi)
- os=-aout
- ;;
-- c4x-* | tic4x-*)
-- os=-coff
-+ c4x-* | tic4x-*)
-+ os=-coff
-+ ;;
-+ hexagon-*)
-+ os=-elf
- ;;
- tic54x-*)
- os=-coff
-@@ -1519,14 +1580,11 @@
- ;;
- m68000-sun)
- os=-sunos3
-- # This also exists in the configure program, but was not the
-- # default.
-- # os=-sunos4
- ;;
- m68*-cisco)
- os=-aout
- ;;
-- mep-*)
-+ mep-*)
- os=-elf
- ;;
- mips*-cisco)
-@@ -1553,7 +1611,7 @@
- *-ibm)
- os=-aix
- ;;
-- *-knuth)
-+ *-knuth)
- os=-mmixware
- ;;
- *-wec)
diff --git a/make-3.82.tar.bz2 b/make-3.82.tar.bz2
deleted file mode 100644
index e00d3bc..0000000
--- a/make-3.82.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e2c1a73f179c40c71e2fe8abf8a8a0688b8499538512984da4a76958d0402966
-size 1242186
diff --git a/make-3.82.tar.bz2.sig b/make-3.82.tar.bz2.sig
deleted file mode 100644
index 4c4359a..0000000
Binary files a/make-3.82.tar.bz2.sig and /dev/null differ
diff --git a/make-4.0.tar.bz2 b/make-4.0.tar.bz2
new file mode 100644
index 0000000..d0c3a4a
--- /dev/null
+++ b/make-4.0.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e60686c7afede62cc8c86ad3012cf081ea4887daf9d223ce7115703b2bb2dbdb
+size 1341927
diff --git a/make-4.0.tar.bz2.sig b/make-4.0.tar.bz2.sig
new file mode 100644
index 0000000..a90a404
Binary files /dev/null and b/make-4.0.tar.bz2.sig differ
diff --git a/make-arglength.patch b/make-arglength.patch
deleted file mode 100644
index b0208cb..0000000
--- a/make-arglength.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-Index: make-3.82/configure.in
-===================================================================
---- make-3.82.orig/configure.in
-+++ make-3.82/configure.in
-@@ -64,7 +64,8 @@ AC_HEADER_DIRENT
- AC_HEADER_STAT
- AC_HEADER_TIME
- AC_CHECK_HEADERS(stdlib.h locale.h unistd.h limits.h fcntl.h string.h \
-- memory.h sys/param.h sys/resource.h sys/time.h sys/timeb.h)
-+ memory.h sys/param.h sys/resource.h sys/time.h sys/timeb.h \
-+ sys/user.h linux/binfmts.h)
-
- # Set a flag if we have an ANSI C compiler
- if test "$ac_cv_prog_cc_stdc" != no; then
-Index: make-3.82/job.c
-===================================================================
---- make-3.82.orig/job.c
-+++ make-3.82/job.c
-@@ -29,6 +29,14 @@ this program. If not, see
-
-+#if defined (HAVE_LINUX_BINFMTS_H) && defined (HAVE_SYS_USER_H)
-+#include
-+#include
-+#ifndef PAGE_SIZE
-+#define PAGE_SIZE getpagesize()
-+#endif
-+#endif
-+
- /* Default shell to use. */
- #ifdef WINDOWS32
- #include
-@@ -2795,6 +2803,7 @@ construct_command_argv_internal (char *l
- unsigned int sflags_len = strlen (shellflags);
- char *command_ptr = NULL; /* used for batch_mode_shell mode */
- char *new_line;
-+ char *args_ptr;
-
- # ifdef __EMX__ /* is this necessary? */
- if (!unixy_shell)
-@@ -2865,8 +2874,17 @@ construct_command_argv_internal (char *l
- return new_argv;
- }
-
-+#ifdef MAX_ARG_STRLEN
-+ static char eval_line[] = "eval\\ \\\"set\\ x\\;\\ shift\\;\\ ";
-+#define ARG_NUMBER_DIGITS 5
-+#define EVAL_LEN (sizeof(eval_line)-1 + shell_len + 4 \
-+ + (7 + ARG_NUMBER_DIGITS) * 2 * line_len / (MAX_ARG_STRLEN - 2))
-+#else
-+#define EVAL_LEN 0
-+#endif
-+
- new_line = alloca (shell_len + 1 + sflags_len + 1
-- + (line_len*2) + 1);
-+ + (line_len*2) + 1 + EVAL_LEN);
- ap = new_line;
- memcpy (ap, shell, shell_len);
- ap += shell_len;
-@@ -2875,6 +2893,30 @@ construct_command_argv_internal (char *l
- ap += sflags_len;
- *(ap++) = ' ';
- command_ptr = ap;
-+
-+#if !defined (WINDOWS32) && defined (MAX_ARG_STRLEN)
-+ if (unixy_shell && line_len > MAX_ARG_STRLEN)
-+ {
-+ unsigned j;
-+ memcpy (ap, eval_line, sizeof (eval_line) - 1);
-+ ap += sizeof (eval_line) - 1;
-+ for (j = 1; j <= 2 * line_len / (MAX_ARG_STRLEN - 2); j++)
-+ ap += sprintf (ap, "\\$\\{%u\\}", j);
-+ *ap++ = '\\';
-+ *ap++ = '"';
-+ *ap++ = ' ';
-+ /* Copy only the first word of SHELL to $0. */
-+ for (p = shell; *p != '\0'; ++p)
-+ {
-+ if (isspace ((unsigned char)*p))
-+ break;
-+ *ap++ = *p;
-+ }
-+ *ap++ = ' ';
-+ }
-+#endif
-+ args_ptr = ap;
-+
- for (p = line; *p != '\0'; ++p)
- {
- if (restp != NULL && *p == '\n')
-@@ -2922,6 +2964,14 @@ construct_command_argv_internal (char *l
- }
- #endif
- *ap++ = *p;
-+
-+#if !defined (WINDOWS32) && defined (MAX_ARG_STRLEN)
-+ if (unixy_shell && line_len > MAX_ARG_STRLEN && (ap - args_ptr > MAX_ARG_STRLEN - 2))
-+ {
-+ *ap++ = ' ';
-+ args_ptr = ap;
-+ }
-+#endif
- }
- if (ap == new_line + shell_len + sflags_len + 2)
- /* Line was empty. */
diff --git a/make-disable-broken-tests.diff b/make-disable-broken-tests.diff
deleted file mode 100644
index 1a9f357..0000000
--- a/make-disable-broken-tests.diff
+++ /dev/null
@@ -1,141 +0,0 @@
-Index: make-3.82/tests/scripts/targets/SECONDARY
-===================================================================
---- make-3.82.orig/tests/scripts/targets/SECONDARY
-+++ make-3.82/tests/scripts/targets/SECONDARY
-@@ -121,69 +121,73 @@ all: version2',
-
- unlink('version2');
-
--# TEST #9 -- Savannah bug #15919
--# The original fix for this bug caused a new bug, shown here.
--
--touch(qw(1.a 2.a));
--
--run_make_test('
--%.c : %.b ; cp $< $@
--%.b : %.a ; cp $< $@
--all : 1.c 2.c', '-rR -j',
--'cp 1.a 1.b
--cp 2.a 2.b
--cp 1.b 1.c
--cp 2.b 2.c
--rm 1.b 2.b');
--
--unlink(qw(1.a 2.a 1.c 2.c));
--
--# TEST #10 -- Savannah bug #15919
--touch('test.0');
--run_make_test('
--.SECONDARY : test.1 test.2 test.3
--
--test : test.4
--
--%.4 : %.int %.3 ; touch $@
--
--%.int : %.3 %.2 ; touch $@
--
--%.3 : | %.2 ; touch $@
--
--%.2 : %.1 ; touch $@
--
--%.1 : %.0 ; touch $@', '-rR -j 2',
--'touch test.1
--touch test.2
--touch test.3
--touch test.int
--touch test.4
--rm test.int');
--
--# After a touch of test.0 it should give the same output, except we don't need
--# to rebuild test.3 (order-only)
--sleep(1);
--touch('test.0');
--run_make_test(undef, '-rR -j 2',
--'touch test.1
--touch test.2
--touch test.int
--touch test.4
--rm test.int');
--
--# With both test.0 and test.3 updated it should still build everything except
--# test.3
--sleep(1);
--touch('test.0', 'test.3');
--run_make_test(undef, '-rR -j 2',
--'touch test.1
--touch test.2
--touch test.int
--touch test.4
--rm test.int');
--
--unlink(qw(test.0 test.1 test.2 test.3 test.4));
-+# All these tests don't reliably work under high load conditions.
-+# Heck, I had two different failures on my workstation, and it's
-+# perfectly clear that ordering can differ. - mhopf
-+
-+# # TEST #9 -- Savannah bug #15919
-+# # The original fix for this bug caused a new bug, shown here.
-+#
-+# touch(qw(1.a 2.a));
-+#
-+# run_make_test('
-+# %.c : %.b ; cp $< $@
-+# %.b : %.a ; cp $< $@
-+# all : 1.c 2.c', '-rR -j',
-+# 'cp 1.a 1.b
-+# cp 2.a 2.b
-+# cp 1.b 1.c
-+# cp 2.b 2.c
-+# rm 1.b 2.b');
-+#
-+# unlink(qw(1.a 2.a 1.c 2.c));
-+#
-+# # TEST #10 -- Savannah bug #15919
-+# touch('test.0');
-+# run_make_test('
-+# .SECONDARY : test.1 test.2 test.3
-+#
-+# test : test.4
-+#
-+# %.4 : %.int %.3 ; touch $@
-+#
-+# %.int : %.3 %.2 ; touch $@
-+#
-+# %.3 : | %.2 ; touch $@
-+#
-+# %.2 : %.1 ; touch $@
-+#
-+# %.1 : %.0 ; touch $@', '-rR -j 2',
-+# 'touch test.1
-+# touch test.2
-+# touch test.3
-+# touch test.int
-+# touch test.4
-+# rm test.int');
-+#
-+# # After a touch of test.0 it should give the same output, except we don't need
-+# # to rebuild test.3 (order-only)
-+# sleep(1);
-+# touch('test.0');
-+# run_make_test(undef, '-rR -j 2',
-+# 'touch test.1
-+# touch test.2
-+# touch test.int
-+# touch test.4
-+# rm test.int');
-+#
-+# # With both test.0 and test.3 updated it should still build everything except
-+# # test.3
-+# sleep(1);
-+# touch('test.0', 'test.3');
-+# run_make_test(undef, '-rR -j 2',
-+# 'touch test.1
-+# touch test.2
-+# touch test.int
-+# touch test.4
-+# rm test.int');
-+#
-+# unlink(qw(test.0 test.1 test.2 test.3 test.4));
-
- # This tells the test driver that the perl test script executed properly.
- 1;
diff --git a/make-fix_whitespace_tokenization.diff b/make-fix_whitespace_tokenization.diff
deleted file mode 100644
index c5b4461..0000000
--- a/make-fix_whitespace_tokenization.diff
+++ /dev/null
@@ -1,30 +0,0 @@
-Index: make-3.82/function.c
-===================================================================
---- make-3.82.orig/function.c
-+++ make-3.82/function.c
-@@ -1133,19 +1133,14 @@ func_sort (char *o, char **argv, const c
-
- /* Find the maximum number of words we'll have. */
- t = argv[0];
-- wordi = 1;
-- while (*t != '\0')
-+ wordi = 0;
-+ while ((p = find_next_token (&t, &len)) != 0)
- {
-- char c = *(t++);
--
-- if (! isspace ((unsigned char)c))
-- continue;
--
-- ++wordi;
--
-- while (isspace ((unsigned char)*t))
-- ++t;
-+ ++t;
-+ wordi++;
- }
-+ if (! wordi)
-+ wordi = 1;
-
- words = xmalloc (wordi * sizeof (char *));
-
diff --git a/make-glob-faster.patch b/make-glob-faster.patch
deleted file mode 100644
index 418358c..0000000
--- a/make-glob-faster.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-Index: read.c
-===================================================================
-RCS file: /sources/make/make/read.c,v
-retrieving revision 1.198
-retrieving revision 1.200
-diff -u -p -u -r1.198 -r1.200
---- read.c 29 Apr 2011 15:27:39 -0000 1.198
-+++ read.c 7 May 2011 14:36:12 -0000 1.200
-@@ -2901,6 +2901,7 @@ parse_file_seq (char **stringp, unsigned
- const char *name;
- const char **nlist = 0;
- char *tildep = 0;
-+ int globme = 1;
- #ifndef NO_ARCHIVES
- char *arname = 0;
- char *memname = 0;
-@@ -3109,32 +3110,40 @@ parse_file_seq (char **stringp, unsigned
- }
- #endif /* !NO_ARCHIVES */
-
-- switch (glob (name, GLOB_NOSORT|GLOB_ALTDIRFUNC, NULL, &gl))
-- {
-- case GLOB_NOSPACE:
-- fatal (NILF, _("virtual memory exhausted"));
--
-- case 0:
-- /* Success. */
-- i = gl.gl_pathc;
-- nlist = (const char **)gl.gl_pathv;
-- break;
--
-- case GLOB_NOMATCH:
-- /* If we want only existing items, skip this one. */
-- if (flags & PARSEFS_EXISTS)
-- {
-- i = 0;
-- break;
-- }
-- /* FALLTHROUGH */
--
-- default:
-- /* By default keep this name. */
-+ /* glob() is expensive: don't call it unless we need to. */
-+ if (!(flags & PARSEFS_EXISTS) && strpbrk (name, "?*[") == NULL)
-+ {
-+ globme = 0;
- i = 1;
- nlist = &name;
-- break;
-- }
-+ }
-+ else
-+ switch (glob (name, GLOB_NOSORT|GLOB_ALTDIRFUNC, NULL, &gl))
-+ {
-+ case GLOB_NOSPACE:
-+ fatal (NILF, _("virtual memory exhausted"));
-+
-+ case 0:
-+ /* Success. */
-+ i = gl.gl_pathc;
-+ nlist = (const char **)gl.gl_pathv;
-+ break;
-+
-+ case GLOB_NOMATCH:
-+ /* If we want only existing items, skip this one. */
-+ if (flags & PARSEFS_EXISTS)
-+ {
-+ i = 0;
-+ break;
-+ }
-+ /* FALLTHROUGH */
-+
-+ default:
-+ /* By default keep this name. */
-+ i = 1;
-+ nlist = &name;
-+ break;
-+ }
-
- /* For each matched element, add it to the list. */
- while (i-- > 0)
-@@ -3174,7 +3183,8 @@ parse_file_seq (char **stringp, unsigned
- #endif /* !NO_ARCHIVES */
- NEWELT (concat (2, prefix, nlist[i]));
-
-- globfree (&gl);
-+ if (globme)
-+ globfree (&gl);
-
- #ifndef NO_ARCHIVES
- if (arname)
-Index: tests/scripts/functions/wildcard
-===================================================================
-RCS file: /sources/make/make/tests/scripts/functions/wildcard,v
-retrieving revision 1.6
-retrieving revision 1.7
-diff -u -p -u -r1.6 -r1.7
---- tests/scripts/functions/wildcard 13 Jun 2009 21:21:49 -0000 1.6
-+++ tests/scripts/functions/wildcard 7 May 2011 14:36:11 -0000 1.7
-@@ -88,4 +88,16 @@ all: ; @echo $(wildcard xz--y*.7)
- !,
- '', "\n");
-
-+# TEST #5: wildcard used to verify file existence
-+
-+touch('xxx.yyy');
-+
-+run_make_test(q!exists: ; @echo file=$(wildcard xxx.yyy)!,
-+ '', "file=xxx.yyy\n");
-+
-+unlink('xxx.yyy');
-+
-+run_make_test(q!exists: ; @echo file=$(wildcard xxx.yyy)!,
-+ '', "file=\n");
-+
- 1;
diff --git a/make-parallel-build.patch b/make-parallel-build.patch
deleted file mode 100644
index 3749121..0000000
--- a/make-parallel-build.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -u make-3.82-orig/remake.c make-3.82/remake.c
---- make-3.82-orig/remake.c 2010-07-13 03:20:42.000000000 +0200
-+++ make-3.82/remake.c 2012-03-21 12:47:52.000000000 +0100
-@@ -301,7 +301,7 @@
- /* Check for the case where a target has been tried and failed but
- the diagnostics hasn't been issued. If we need the diagnostics
- then we will have to continue. */
-- if (!(f->updated && f->update_status > 0 && !f->dontcare && f->no_diag))
-+ if (!(f->updated && f->update_status > 0 && !f->dontcare && f->no_diag) && f->command_state!=cs_not_started )
- {
- DBF (DB_VERBOSE, _("Pruning file `%s'.\n"));
- return f->command_state == cs_finished ? f->update_status : 0;
-@@ -614,6 +614,12 @@
- d->file->dontcare = file->dontcare;
- }
-
-+ /* We may have already encountered this file earlier in the same
-+ * pass before we knew we'd be updating this target. In that
-+ * case calling update_file now would result in the file being
-+ * inappropriately pruned so we toggle the considered bit back
-+ * off first. */
-+ d->file->considered = !considered;
-
- dep_status |= update_file (d->file, depth);
-
-
-
diff --git a/make-savannah-bug30612-handling_of_archives.diff b/make-savannah-bug30612-handling_of_archives.diff
deleted file mode 100644
index fd0b9b5..0000000
--- a/make-savannah-bug30612-handling_of_archives.diff
+++ /dev/null
@@ -1,235 +0,0 @@
-Index: ChangeLog
-===================================================================
-RCS file: /sources/make/make/ChangeLog,v
-retrieving revision 2.419
-retrieving revision 2.420
-diff -u -p -u -p -r2.419 -r2.420
---- ChangeLog 10 Aug 2010 07:35:34 -0000 2.419
-+++ ChangeLog 14 Aug 2010 02:50:14 -0000 2.420
-@@ -1,3 +1,17 @@
-+2010-08-13 Paul Smith
-+
-+ * NEWS: Accidentally forgot to back out the sorted wildcard
-+ enhancement in 3.82, so update NEWS.
-+ Also add NEWS about the error check for explicit and pattern
-+ targets in the same rule, added to 3.82.
-+
-+ * main.c (main): Add "oneshell" to $(.FEATURES) (forgot to add
-+ this in 3.82!)
-+
-+ * read.c (parse_file_seq): Fix various errors parsing archives
-+ with multiple objects in the parenthesis, as well as wildcards.
-+ Fixes Savannah bug #30612.
-+
- 2010-08-10 Paul Smith
-
- * main.c (main): Expand MAKEFLAGS before adding it to the
-Index: NEWS
-===================================================================
-RCS file: /sources/make/make/NEWS,v
-retrieving revision 2.109
-retrieving revision 2.110
-diff -u -p -u -p -r2.109 -r2.110
---- NEWS 28 Jul 2010 05:39:50 -0000 2.109
-+++ NEWS 14 Aug 2010 02:50:14 -0000 2.110
-@@ -18,14 +18,6 @@ http://sv.gnu.org/bugs/index.php?group=m
- * Compiling GNU make now requires a conforming ISO C 1989 compiler and
- standard runtime library.
-
--* WARNING: Future backward-incompatibility!
-- Wildcards are not documented as returning sorted values, but up to and
-- including this release the results have been sorted and some makefiles are
-- apparently depending on that. In the next release of GNU make, for
-- performance reasons, we may remove that sorting. If your makefiles
-- require sorted results from wildcard expansions, use the $(sort ...)
-- function to request it explicitly.
--
- * WARNING: Backward-incompatibility!
- The POSIX standard for make was changed in the 2008 version in a
- fundamentally incompatible way: make is required to invoke the shell as if
-@@ -42,6 +34,21 @@ http://sv.gnu.org/bugs/index.php?group=m
- existing targets were provided in $?).
-
- * WARNING: Backward-incompatibility!
-+ Wildcards were not documented as returning sorted values, but the results
-+ have been sorted up until this release.. If your makefiles require sorted
-+ results from wildcard expansions, use the $(sort ...) function to request
-+ it explicitly.
-+
-+* WARNING: Backward-incompatibility!
-+ In previous versions of make it was acceptable to list one or more explicit
-+ targets followed by one or more pattern targets in the same rule and it
-+ worked "as expected". However, this was not documented as acceptable and if
-+ you listed any explicit targets AFTER the pattern targets, the entire rule
-+ would be mis-parsed. This release removes this ability completely: make
-+ will generate an error message if you mix explicit and pattern targets in
-+ the same rule.
-+
-+* WARNING: Backward-incompatibility!
- As a result of parser enhancements, three backward-compatibility issues
- exist: first, a prerequisite containing an "=" cannot be escaped with a
- backslash any longer. You must create a variable containing an "=" and
-Index: main.c
-===================================================================
-RCS file: /sources/make/make/main.c,v
-retrieving revision 1.244
-retrieving revision 1.245
-diff -u -p -u -p -r1.244 -r1.245
---- main.c 10 Aug 2010 07:35:34 -0000 1.244
-+++ main.c 14 Aug 2010 02:50:14 -0000 1.245
-@@ -1138,7 +1138,7 @@ main (int argc, char **argv, char **envp
- a macro and some compilers (MSVC) don't like conditionals in macros. */
- {
- const char *features = "target-specific order-only second-expansion"
-- " else-if shortest-stem undefine"
-+ " else-if shortest-stem undefine oneshell"
- #ifndef NO_ARCHIVES
- " archives"
- #endif
-Index: read.c
-===================================================================
-RCS file: /sources/make/make/read.c,v
-retrieving revision 1.193
-retrieving revision 1.194
-diff -u -p -u -p -r1.193 -r1.194
---- read.c 13 Jul 2010 01:20:42 -0000 1.193
-+++ read.c 14 Aug 2010 02:50:14 -0000 1.194
-@@ -3028,7 +3028,7 @@ parse_file_seq (char **stringp, unsigned
- {
- /* This looks like the first element in an open archive group.
- A valid group MUST have ')' as the last character. */
-- const char *e = p + nlen;
-+ const char *e = p;
- do
- {
- e = next_token (e);
-@@ -3084,19 +3084,19 @@ parse_file_seq (char **stringp, unsigned
- Go to the next item in the string. */
- if (flags & PARSEFS_NOGLOB)
- {
-- NEWELT (concat (2, prefix, tp));
-+ NEWELT (concat (2, prefix, tmpbuf));
- continue;
- }
-
- /* If we get here we know we're doing glob expansion.
- TP is a string in tmpbuf. NLEN is no longer used.
- We may need to do more work: after this NAME will be set. */
-- name = tp;
-+ name = tmpbuf;
-
- /* Expand tilde if applicable. */
-- if (tp[0] == '~')
-+ if (tmpbuf[0] == '~')
- {
-- tildep = tilde_expand (tp);
-+ tildep = tilde_expand (tmpbuf);
- if (tildep != 0)
- name = tildep;
- }
-@@ -3152,7 +3152,10 @@ parse_file_seq (char **stringp, unsigned
- else
- {
- /* We got a chain of items. Attach them. */
-- (*newp)->next = found;
-+ if (*newp)
-+ (*newp)->next = found;
-+ else
-+ *newp = found;
-
- /* Find and set the new end. Massage names if necessary. */
- while (1)
-Index: tests/ChangeLog
-===================================================================
-RCS file: /sources/make/make/tests/ChangeLog,v
-retrieving revision 1.150
-retrieving revision 1.151
-diff -u -p -u -p -r1.150 -r1.151
---- tests/ChangeLog 10 Aug 2010 07:35:34 -0000 1.150
-+++ tests/ChangeLog 14 Aug 2010 02:50:14 -0000 1.151
-@@ -1,3 +1,11 @@
-+2010-08-13 Paul Smith
-+
-+ * scripts/features/archives: New regression tests for archive
-+ support. Test for fix to Savannah bug #30612.
-+
-+ * run_make_tests.pl (set_more_defaults): Set a %FEATURES hash to
-+ the features available in $(.FEATURES).
-+
- 2010-08-10 Paul Smith
-
- * scripts/features/reinvoke: Ensure command line variable settings
-Index: tests/run_make_tests.pl
-===================================================================
-RCS file: /sources/make/make/tests/run_make_tests.pl,v
-retrieving revision 1.32
-retrieving revision 1.33
-diff -u -p -u -p -r1.32 -r1.33
---- tests/run_make_tests.pl 13 Jul 2010 01:20:43 -0000 1.32
-+++ tests/run_make_tests.pl 14 Aug 2010 02:50:14 -0000 1.33
-@@ -29,6 +29,7 @@
- # You should have received a copy of the GNU General Public License along with
- # this program. If not, see .
-
-+%FEATURES = ();
-
- $valgrind = 0; # invoke make with valgrind
- $valgrind_args = '';
-@@ -367,6 +368,8 @@ sub set_more_defaults
- $parallel_jobs = 1;
- }
-
-+ %FEATURES = map { $_ => 1 } split /\s+/, `sh -c "echo '\\\$(info \\\$(.FEATURES))' | $make_path -f- 2>/dev/null"`;
-+
- # Set up for valgrind, if requested.
-
- if ($valgrind) {
-Index: tests/scripts/features/archives
-===================================================================
-RCS file: tests/scripts/features/archives
-diff -N tests/scripts/features/archives
---- /dev/null 1 Jan 1970 00:00:00 -0000
-+++ tests/scripts/features/archives 14 Aug 2010 02:50:14 -0000 1.1
-@@ -0,0 +1,42 @@
-+# -*-mode: perl-*-
-+
-+$description = "Test GNU make's archive management features.";
-+
-+$details = "\
-+This only works on systems that support it.";
-+
-+# If this instance of make doesn't support archives, skip it
-+exists $FEATURES{archives} or return -1;
-+
-+# Create some .o files to work with
-+utouch(-60, qw(a1.o a2.o a3.o));
-+
-+# Very simple
-+run_make_test('all: libxx.a(a1.o)',
-+ '', "ar rv libxx.a a1.o\nar: creating libxx.a\na - a1.o\n");
-+
-+# Multiple .o's. Add a new one to the existing library
-+run_make_test('all: libxx.a(a1.o a2.o)',
-+ '', "ar rv libxx.a a2.o\na - a2.o\n");
-+
-+# Touch one of the .o's so it's rebuilt
-+utouch(-40, 'a1.o');
-+run_make_test(undef, '', "ar rv libxx.a a1.o\nr - a1.o\n");
-+
-+# Use wildcards
-+run_make_test('all: libxx.a(*.o)',
-+ '', "#MAKE#: Nothing to be done for `all'.\n");
-+
-+# Touch one of the .o's so it's rebuilt
-+utouch(-30, 'a1.o');
-+run_make_test(undef, '', "ar rv libxx.a a1.o\nr - a1.o\n");
-+
-+# Use both wildcards and simple names
-+utouch(-50, 'a2.o');
-+run_make_test('all: libxx.a(a3.o *.o)', '',
-+ "ar rv libxx.a a3.o\na - a3.o\nar rv libxx.a a2.o\nr - a2.o\n");
-+
-+rmfiles(qw(a1.o a2.o a3.o libxx.a));
-+
-+# This tells the test driver that the perl test script executed properly.
-+1;
diff --git a/make-savannah-bug30723-expand_makeflags_before_reexec.diff b/make-savannah-bug30723-expand_makeflags_before_reexec.diff
deleted file mode 100644
index eaecb98..0000000
--- a/make-savannah-bug30723-expand_makeflags_before_reexec.diff
+++ /dev/null
@@ -1,85 +0,0 @@
-Index: ChangeLog
-===================================================================
-RCS file: /sources/make/make/ChangeLog,v
-retrieving revision 2.418
-retrieving revision 2.419
-diff -u -p -u -p -r2.418 -r2.419
---- ChangeLog 7 Aug 2010 08:55:17 -0000 2.418
-+++ ChangeLog 10 Aug 2010 07:35:34 -0000 2.419
-@@ -1,3 +1,8 @@
-+2010-08-10 Paul Smith
-+
-+ * main.c (main): Expand MAKEFLAGS before adding it to the
-+ environment when re-exec'ing. Fixes Savannah bug #30723.
-+
- 2010-07-28 Paul Smith
-
- Version 3.82 released.
-Index: main.c
-===================================================================
-RCS file: /sources/make/make/main.c,v
-retrieving revision 1.243
-retrieving revision 1.244
-diff -u -p -u -p -r1.243 -r1.244
---- main.c 19 Jul 2010 07:10:53 -0000 1.243
-+++ main.c 10 Aug 2010 07:35:34 -0000 1.244
-@@ -2093,7 +2093,7 @@ main (int argc, char **argv, char **envp
- const char *pv = define_makeflags (1, 1);
- char *p = alloca (sizeof ("MAKEFLAGS=") + strlen (pv) + 1);
- sprintf (p, "MAKEFLAGS=%s", pv);
-- putenv (p);
-+ putenv (allocated_variable_expand (p));
- }
-
- if (ISDB (DB_BASIC))
-Index: tests/ChangeLog
-===================================================================
-RCS file: /sources/make/make/tests/ChangeLog,v
-retrieving revision 1.149
-retrieving revision 1.150
-diff -u -p -u -p -r1.149 -r1.150
---- tests/ChangeLog 28 Jul 2010 05:39:50 -0000 1.149
-+++ tests/ChangeLog 10 Aug 2010 07:35:34 -0000 1.150
-@@ -1,3 +1,8 @@
-+2010-08-10 Paul Smith
-+
-+ * scripts/features/reinvoke: Ensure command line variable settings
-+ are preserved across make re-exec. Tests Savannah bug #30723.
-+
- 2010-07-28 Paul Smith
-
- * scripts/targets/POSIX: Compatibility issues with Solaris (and
-Index: tests/scripts/features/reinvoke
-===================================================================
-RCS file: /sources/make/make/tests/scripts/features/reinvoke,v
-retrieving revision 1.7
-retrieving revision 1.8
-diff -u -p -u -p -r1.7 -r1.8
---- tests/scripts/features/reinvoke 27 Jun 2005 22:18:47 -0000 1.7
-+++ tests/scripts/features/reinvoke 10 Aug 2010 07:35:34 -0000 1.8
-@@ -57,9 +57,24 @@ include $(F)',
- # Now try with the file we're not updating being the actual file we're
- # including: this and the previous one test different parts of the code.
-
--run_make_test(undef, "F=b", "[ -f b ] || echo >> b\nhello\n")
-+run_make_test(undef, 'F=b', "[ -f b ] || echo >> b\nhello\n")
-
- &rmfiles('a','b','c');
-
-+# Ensure command line variables are preserved properly across re-exec
-+# Tests for Savannah bug #30723
-+
-+run_make_test('
-+ifdef RECURSE
-+-include foo30723
-+endif
-+recurse: ; @$(MAKE) -f $(MAKEFILE_LIST) RECURSE=1 test
-+test: ; @echo F.O=$(F.O)
-+foo30723: ; @touch $@
-+',
-+ '--no-print-directory F.O=bar', "F.O=bar\n");
-+
-+unlink('foo30723');
-+
- # This tells the test driver that the perl test script executed properly.
- 1;
diff --git a/make-slowdown-parallelism.diff b/make-slowdown-parallelism.diff
deleted file mode 100644
index da41a92..0000000
--- a/make-slowdown-parallelism.diff
+++ /dev/null
@@ -1,135 +0,0 @@
-Index: tests/scripts/features/double_colon
-===================================================================
---- tests/scripts/features/double_colon.orig
-+++ tests/scripts/features/double_colon
-@@ -23,7 +23,7 @@ all: baz
- foo:: f1.h ; @echo foo FIRST
- foo:: f2.h ; @echo foo SECOND
-
--bar:: ; @echo aaa; sleep 1; echo aaa done
-+bar:: ; @echo aaa; sleep 4; echo aaa done
- bar:: ; @echo bbb
-
- baz:: ; @echo aaa
-Index: tests/scripts/features/parallelism
-===================================================================
---- tests/scripts/features/parallelism.orig
-+++ tests/scripts/features/parallelism
-@@ -27,9 +27,9 @@ else {
-
- run_make_test("
- all : def_1 def_2 def_3
--def_1 : ; \@echo ONE; $sleep_command 3 ; echo TWO
--def_2 : ; \@$sleep_command 2 ; echo THREE
--def_3 : ; \@$sleep_command 1 ; echo FOUR",
-+def_1 : ; \@echo ONE; $sleep_command 12 ; echo TWO
-+def_2 : ; \@$sleep_command 8 ; echo THREE
-+def_3 : ; \@$sleep_command 4 ; echo FOUR",
- '-j4', "ONE\nFOUR\nTHREE\nTWO");
-
- # Test parallelism with included files. Here we sleep/echo while
-@@ -38,8 +38,8 @@ def_3 : ; \@$sleep_command 1 ; echo FOUR
- run_make_test("
- all: 1 2; \@echo success
- -include 1.inc 2.inc
--1.inc: ; \@echo ONE.inc; $sleep_command 2; echo TWO.inc; echo '1: ; \@echo ONE; $sleep_command 2; echo TWO' > \$\@
--2.inc: ; \@$sleep_command 1; echo THREE.inc; echo '2: ; \@$sleep_command 1; echo THREE' > \$\@",
-+1.inc: ; \@echo ONE.inc; $sleep_command 8; echo TWO.inc; echo '1: ; \@echo ONE; $sleep_command 8; echo TWO' > \$\@
-+2.inc: ; \@$sleep_command 4; echo THREE.inc; echo '2: ; \@$sleep_command 4; echo THREE' > \$\@",
- "-j4",
- "ONE.inc\nTHREE.inc\nTWO.inc\nONE\nTHREE\nTWO\nsuccess\n");
-
-@@ -57,8 +57,8 @@ ifeq (\$(INC),yes)
- -include 1.inc 2.inc
- endif
-
--1.inc: ; \@echo ONE.inc; $sleep_command 2; echo TWO.inc; echo '1: ; \@echo ONE; $sleep_command 2; echo TWO' > \$\@
--2.inc: ; \@$sleep_command 1; echo THREE.inc; echo '2: ; \@$sleep_command 1; echo THREE' > \$\@",
-+1.inc: ; \@echo ONE.inc; $sleep_command 8; echo TWO.inc; echo '1: ; \@echo ONE; $sleep_command 8; echo TWO' > \$\@
-+2.inc: ; \@$sleep_command 4; echo THREE.inc; echo '2: ; \@$sleep_command 4; echo THREE' > \$\@",
- "-j4",
- "ONE.inc\nTHREE.inc\nTWO.inc\nONE\nTHREE\nTWO\nsuccess\n");
-
-@@ -74,37 +74,37 @@ rmfiles(qw(1.inc 2.inc));
- run_make_test("
- export HI = \$(shell \$(\$\@.CMD))
- first.CMD = echo hi
--second.CMD = $sleep_command 4; echo hi
-+second.CMD = $sleep_command 16; echo hi
-
- .PHONY: all first second
- all: first second
-
--first second: ; \@echo \$\@; $sleep_command 1; echo \$\@",
-- '-j2', "first\nfirst\nsecond\nsecond", 0, 7);
-+first second: ; \@echo \$\@; $sleep_command 4; echo \$\@",
-+ '-j2', "first\nfirst\nsecond\nsecond", 0, 28);
-
- # Michael Matz reported a bug where if make is running in
- # parallel without -k and two jobs die in a row, but not too close to each
- # other, then make will quit without waiting for the rest of the jobs to die.
-
- run_make_test("
--.PHONY: all fail.1 fail.2 fail.3 ok
--all: fail.1 ok fail.2 fail.3
-+.PHONY: all fail.3 fail.6 fail.9 ok
-+all: fail.3 ok fail.6 fail.9
-
--fail.1 fail.2 fail.3:
-+fail.3 fail.6 fail.9:
- \@sleep \$(patsubst fail.%,%,\$\@)
- \@echo Fail
- \@exit 1
-
- ok:
-- \@sleep 4
-+ \@sleep 12
- \@echo Ok done",
- '-rR -j5', 'Fail
--#MAKE#: *** [fail.1] Error 1
-+#MAKE#: *** [fail.3] Error 1
- #MAKE#: *** Waiting for unfinished jobs....
- Fail
--#MAKE#: *** [fail.2] Error 1
-+#MAKE#: *** [fail.6] Error 1
- Fail
--#MAKE#: *** [fail.3] Error 1
-+#MAKE#: *** [fail.9] Error 1
- Ok done',
- 512);
-
-Index: tests/scripts/options/dash-l
-===================================================================
---- tests/scripts/options/dash-l.orig
-+++ tests/scripts/options/dash-l
-@@ -25,7 +25,7 @@ SHELL = /bin/sh
-
- define test
- if [ ! -f test-file ]; then \
-- echo >> test-file; sleep 2; rm -f test-file; \
-+ echo >> test-file; sleep 8; rm -f test-file; \
- else \
- echo $@ FAILED; \
- fi
-@@ -46,7 +46,7 @@ $mkoptions = "-l 0.0001";
- $mkoptions .= " -j 4" if ($parallel_jobs);
-
- # We have to wait longer than the default (5s).
--&run_make_with_options($makefile, $mkoptions, &get_logfile, 0, 8);
-+&run_make_with_options($makefile, $mkoptions, &get_logfile, 0, 32);
-
- $slurp = &read_file_into_string (&get_logfile(1));
- if ($slurp !~ /cannot enforce load limit/) {
-Index: tests/test_driver.pl
-===================================================================
---- tests/test_driver.pl.orig
-+++ tests/test_driver.pl
-@@ -52,7 +52,7 @@ $test_passed = 1;
-
-
- # Timeout in seconds. If the test takes longer than this we'll fail it.
--$test_timeout = 5;
-+$test_timeout = 20;
-
- # Path to Perl
- $perl_name = $^X;
diff --git a/make.changes b/make.changes
index 75060c8..3e68020 100644
--- a/make.changes
+++ b/make.changes
@@ -1,3 +1,63 @@
+-------------------------------------------------------------------
+Thu Nov 21 12:51:32 UTC 2013 - sweet_f_a@gmx.de
+
+- Update to 4.0
+ * see details in NEWS and ChangeLog files
+ * Bugfixes, a complete list of bugs fixed in this version is
+ available here
+ http://sv.gnu.org/bugs/index.php?group=make&report_id=111&fix_release_id=101&set=custom
+ * WARNING: Backward-incompatibility! backslash/newline handling
+ * New feature: GNU Guile integration
+ * New command line option: --output-sync (-O) enables grouping of
+ output by target or by recursive make.
+ * New command line option: --trace enables tracing of targets.
+ * New command line option argument: --debug now accepts a "n"
+ (none) flag which disables all debugging settings that are
+ currently enabled.
+ * New feature: The "job server" capability is now supported on
+ Windows.
+ * New feature: The .ONESHELL capability is now supported on
+ Windows.
+ * New feature: "!=" shell assignment operator as an alternative
+ to the $(shell ...) function. Implemented for compatibility
+ with BSD makefiles.
+ * New feature: "::=" simple assignment operator as defined by
+ POSIX in 2012.
+ * New feature: Loadable objects
+ * New function: $(file ...) writes to a file.
+ * New variable: $(GNUMAKEFLAGS) will be parsed for make flags,
+ just like MAKEFLAGS is. It can be set in the environment or
+ the makefile, containing GNU make-specific flags to allow your
+ makefile to be portable to other versions of make.
+ * New variable: `MAKE_HOST' gives the name of the host
+ architecture make was compiled for.
+ * Behavior of MAKEFLAGS and MFLAGS is more rigorously defined.
+ * Setting the -r and -R options in MAKEFLAGS inside a makefile
+ now works as expected, removing all built-in rules and
+ variables, respectively.
+ * If a recipe fails, the makefile name and linenumber of the
+ recipe are shown.
+ * A .RECIPEPREFIX setting is remembered per-recipe and variables
+ expanded in that recipe also use that recipe prefix setting.
+ * In -p output, .RECIPEPREFIX settings are shown and all
+ target-specific variables are output as if in a makefile,
+ instead of as comments.
+ * On MS-Windows, recipes that use ".." quoting will no longer force
+ invocation of commands via temporary batch files.
+- Removed following patches, applied by upstream or fixed otherwise
+ * make-disable-broken-tests.diff
+ * make-savannah-bug30723-expand_makeflags_before_reexec.diff
+ * make-savannah-bug30612-handling_of_archives.diff
+ * make-fix_whitespace_tokenization.diff
+ * make-glob-faster.patch
+ * make-parallel-build.patch
+ * bug-841457_make-savannah-bug30612-handling_of_archives-part2.txt
+ * config-guess-update.diff
+- remove make-arglength.patch which was rejected by upstream. It
+ was just a dirty hack to build a broken libwebkit version
+- remove make-slowdown-parallelism.diff, haven't seen any timing
+ problems of the test-suite anymore
+
-------------------------------------------------------------------
Sun Sep 29 17:56:07 UTC 2013 - meissner@suse.com
diff --git a/make.spec b/make.spec
index da10b95..dbdb4f8 100644
--- a/make.spec
+++ b/make.spec
@@ -20,7 +20,7 @@ Name: make
Url: http://www.gnu.org/software/make/make.html
Provides: gmake
PreReq: %install_info_prereq
-Version: 3.82
+Version: 4.0
Release: 0
Summary: GNU make
License: GPL-2.0+
@@ -29,20 +29,7 @@ Source: http://ftp.gnu.org/gnu/make/make-%version.tar.bz2
Source1: http://ftp.gnu.org/gnu/make/make-%version.tar.bz2.sig
# keyring downloaded from http://savannah.gnu.org/project/memberlist-gpgkeys.php?group=make
Source2: %name.keyring
-Patch2: make-slowdown-parallelism.diff
-Patch3: make-disable-broken-tests.diff
-Patch4: make-savannah-bug30723-expand_makeflags_before_reexec.diff
-Patch5: make-savannah-bug30612-handling_of_archives.diff
-Patch6: make-fix_whitespace_tokenization.diff
-Patch7: make-glob-faster.patch
-# PATCH-FIX-UPSTREAM make-arglength.patch dimstar@opensuse.org -- http://article.gmane.org/gmane.comp.gnu.make.bugs/4219
-Patch8: make-arglength.patch
-# PATCH-FIX-UPSTREAM make-parallel-build.patch dmistar@opensuse.org -- http://savannah.gnu.org/bugs/?30653
-Patch9: make-parallel-build.patch
-# PATCH-FIX-UPSTREAM bug-841457_make-savannah-bug30612-handling_of_archives-part2.txt meissner@suse.com -- https://bugzilla.novell.com/show_bug.cgi?id=841457
-Patch10: bug-841457_make-savannah-bug30612-handling_of_archives-part2.txt
Patch64: make-library-search-path.diff
-Patch65: config-guess-update.diff
#BuildRequires: gpg-offline
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -51,19 +38,9 @@ The GNU make command with extensive documentation.
%prep
%setup -q
-%patch2
-%patch3 -p1
-%patch4
-%patch5
-%patch6 -p1
-%patch7 -p0
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
if [ %_lib == lib64 ]; then
%patch64
fi
-%patch65
%build
CFLAGS=$RPM_OPT_FLAGS \
@@ -77,6 +54,8 @@ make check
make DESTDIR=$RPM_BUILD_ROOT install
ln -s make $RPM_BUILD_ROOT/usr/bin/gmake
%find_lang %name
+# gnumake.h was introduced in 4.0, looks useless
+rm $RPM_BUILD_ROOT/usr/include/gnumake.h
%files -f %name.lang
%defattr(-,root,root)