From 66448b56d844b2ff0d64c60967f9d18672db2ee9 Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Wed, 1 Oct 2014 09:57:16 +0000 Subject: [PATCH] make: updated to 4.0 --- make/.footprint | 2 + make/.md5sum | 5 +-- make/Pkgfile | 8 ++-- make/make-3.82-bug_30612.patch | 70 ---------------------------------- make/make-3.82-bug_30653.patch | 22 ----------- make/make-3.82-bug_30723.patch | 20 ---------- 6 files changed, 6 insertions(+), 121 deletions(-) delete mode 100644 make/make-3.82-bug_30612.patch delete mode 100644 make/make-3.82-bug_30653.patch delete mode 100644 make/make-3.82-bug_30723.patch diff --git a/make/.footprint b/make/.footprint index 9f0c1c2..709f793 100644 --- a/make/.footprint +++ b/make/.footprint @@ -1,6 +1,8 @@ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/make +drwxr-xr-x root/root usr/include/ +-rw-r--r-- root/root usr/include/gnumake.h drwxr-xr-x root/root usr/man/ drwxr-xr-x root/root usr/man/man1/ -rw-r--r-- root/root usr/man/man1/make.1.gz diff --git a/make/.md5sum b/make/.md5sum index 162bedf..340e211 100644 --- a/make/.md5sum +++ b/make/.md5sum @@ -1,4 +1 @@ -d8b96e411faf7e4f8b1c3df16c7c30b6 make-3.82-bug_30612.patch -126135ffa8383013e935f08cf9904ced make-3.82-bug_30653.patch -57b24985c2d2eb7e60fee623c2cd883a make-3.82-bug_30723.patch -1a11100f3c63fcf5753818e59d63088f make-3.82.tar.bz2 +571d470a7647b455e3af3f92d79f1c18 make-4.0.tar.bz2 diff --git a/make/Pkgfile b/make/Pkgfile index dce9b6f..0cd019b 100644 --- a/make/Pkgfile +++ b/make/Pkgfile @@ -4,14 +4,12 @@ # Arch Maintainer: CRUX-ARM System Team, devel at crux-arm dot nu name=make -version=3.82 -release=3 -source=(ftp://ftp.gnu.org/gnu/$name/$name-$version.tar.bz2 - $name-$version-bug_{30612,30653,30723}.patch) +version=4.0 +release=1 +source=(ftp://ftp.gnu.org/gnu/$name/$name-$version.tar.bz2) build() { cd $name-$version - cat $SRC/$name-$version-*.patch | patch -p1 ./configure --build=$CHOST \ --host=$CTARGET \ --prefix=/usr \ diff --git a/make/make-3.82-bug_30612.patch b/make/make-3.82-bug_30612.patch deleted file mode 100644 index cdba1f4..0000000 --- a/make/make-3.82-bug_30612.patch +++ /dev/null @@ -1,70 +0,0 @@ -commit 2a59dc32aaf0681dec569f32a9d7ab88a379d34f -Author: psmith -Date: Sat Aug 14 02:50:14 2010 +0000 - - - Fix the NEWS file to be accurate - - Add oneshell to $(.FEATURES) (forgot that!) - - Fix Savannah bug #30612: handling of archive references with >1 object - -diff --git a/main.c b/main.c -index 9fe8090..782b0de 100644 ---- a/main.c -+++ b/main.c -@@ -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 -diff --git a/read.c b/read.c -index a3ad88e..9dfd4ea 100644 ---- a/read.c -+++ b/read.c -@@ -3028,7 +3028,7 @@ parse_file_seq (char **stringp, unsigned int size, int stopchar, - { - /* 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 int size, int stopchar, - 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 int size, int stopchar, - 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) diff --git a/make/make-3.82-bug_30653.patch b/make/make-3.82-bug_30653.patch deleted file mode 100644 index fbe2f77..0000000 --- a/make/make-3.82-bug_30653.patch +++ /dev/null @@ -1,22 +0,0 @@ -commit d1ba0ee36b2bdd91434b5df90f0f4cceda7d6979 -Author: psmith -Date: Mon Sep 10 02:36:05 2012 +0000 - - Force intermediate targets to be considered if their non-intermediate - parent needs to be remade. Fixes Savannah bug #30653. - -diff --git a/remake.c b/remake.c -index c0bf709..b1ddd23 100644 ---- a/remake.c -+++ b/remake.c -@@ -612,6 +612,10 @@ update_file_1 (struct file *file, unsigned int depth) - d->file->dontcare = file->dontcare; - } - -+ /* We may have already considered this file, when we didn't know -+ we'd need to update it. Force update_file() to consider it and -+ not prune it. */ -+ d->file->considered = !considered; - - dep_status |= update_file (d->file, depth); - diff --git a/make/make-3.82-bug_30723.patch b/make/make-3.82-bug_30723.patch deleted file mode 100644 index dfb0660..0000000 --- a/make/make-3.82-bug_30723.patch +++ /dev/null @@ -1,20 +0,0 @@ -commit a6f280559f34dc805381507e59c9189b7149b853 -Author: psmith -Date: Tue Aug 10 07:35:34 2010 +0000 - - Fix Savannah bug #30723: expand MAKEFLAGS before we re-exec after - rebuilding makefiles. - -diff --git a/main.c b/main.c -index c6989e3..9fe8090 100644 ---- a/main.c -+++ b/main.c -@@ -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)) -- 2.26.2