make: add two patches from archlinux, bumprev.

This commit is contained in:
Juan RP 2010-10-22 11:19:16 +02:00
parent b2403cc32e
commit ace54de85c
5 changed files with 81 additions and 0 deletions

View file

@ -0,0 +1,66 @@
diff -Naur make-3.82-orig/main.c make-3.82-fix30612//main.c
--- make-3.82-orig/main.c 2010-07-19 17:10:53.000000000 +1000
+++ make-3.82-fix30612//main.c 2010-09-23 23:33:37.908855839 +1000
@@ -1,3 +1,4 @@
+
/* Argument parsing and main program of GNU Make.
Copyright (C) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997,
1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
@@ -1138,7 +1139,7 @@
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 -Naur make-3.82-orig/read.c make-3.82-fix30612//read.c
--- make-3.82-orig/read.c 2010-07-13 11:20:42.000000000 +1000
+++ make-3.82-fix30612//read.c 2010-09-23 23:30:58.018855839 +1000
@@ -3028,7 +3028,7 @@
{
/* 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 @@
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,11 @@
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)

View file

@ -0,0 +1 @@
-Np1

View file

@ -0,0 +1,12 @@
diff -Naur make-3.82-orig/main.c make-3.82-fix30723//main.c
--- make-3.82-orig/main.c 2010-07-19 17:10:53.000000000 +1000
+++ make-3.82-fix30723//main.c 2010-09-23 23:34:10.932188592 +1000
@@ -2093,7 +2093,7 @@
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))

View file

@ -0,0 +1 @@
-Np1

View file

@ -1,6 +1,7 @@
# Template build file for 'make'
pkgname=make
version=3.82
revision=1
distfiles="http://ftp.gnu.org/pub/gnu/make/$pkgname-$version.tar.bz2"
build_style=gnu_configure
short_desc="The GNU make system"