mirror of
https://gitdl.cn/https://github.com/chakralinux/core.git
synced 2025-01-23 17:33:26 +08:00
missing new patches for make
This commit is contained in:
parent
fd31c2c6ed
commit
bfe1607bb8
66
make/bug30612.patch
Normal file
66
make/bug30612.patch
Normal 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)
|
12
make/bug30723.patch
Normal file
12
make/bug30723.patch
Normal 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))
|
36
make/make-3.82-makeflags.patch
Normal file
36
make/make-3.82-makeflags.patch
Normal file
@ -0,0 +1,36 @@
|
||||
Index: main.c
|
||||
===================================================================
|
||||
RCS file: /sources/make/make/main.c,v
|
||||
retrieving revision 1.246
|
||||
diff -u -r1.246 main.c
|
||||
--- main.c 29 Aug 2010 23:05:27 -0000 1.246
|
||||
+++ main.c 27 Jul 2011 22:03:12 -0000
|
||||
@@ -2091,10 +2095,16 @@
|
||||
|
||||
/* Reset makeflags in case they were changed. */
|
||||
{
|
||||
+ if (master_job_slots)
|
||||
+ {
|
||||
+ assert (job_slots == default_job_slots);
|
||||
+ job_slots = master_job_slots;
|
||||
+ }
|
||||
const char *pv = define_makeflags (1, 1);
|
||||
char *p = alloca (sizeof ("MAKEFLAGS=") + strlen (pv) + 1);
|
||||
sprintf (p, "MAKEFLAGS=%s", pv);
|
||||
putenv (allocated_variable_expand (p));
|
||||
+ job_slots = default_job_slots;
|
||||
}
|
||||
|
||||
if (ISDB (DB_BASIC))
|
||||
@@ -2825,9 +2852,11 @@
|
||||
&& (*(unsigned int *) cs->value_ptr ==
|
||||
*(unsigned int *) cs->noarg_value))
|
||||
ADD_FLAG ("", 0); /* Optional value omitted; see below. */
|
||||
+#if 0
|
||||
else if (cs->c == 'j')
|
||||
/* Special case for `-j'. */
|
||||
ADD_FLAG ("1", 1);
|
||||
+#endif
|
||||
else
|
||||
{
|
||||
char *buf = alloca (30);
|
17
make/make-3.82-sort-blank.patch
Normal file
17
make/make-3.82-sort-blank.patch
Normal file
@ -0,0 +1,17 @@
|
||||
diff -urp make-3.82/function.c make-3.82-pm/function.c
|
||||
--- make-3.82/function.c 2010-07-13 03:20:39.000000000 +0200
|
||||
+++ make-3.82-pm/function.c 2010-10-27 01:43:27.000000000 +0200
|
||||
@@ -1138,12 +1138,12 @@ func_sort (char *o, char **argv, const c
|
||||
{
|
||||
char c = *(t++);
|
||||
|
||||
- if (! isspace ((unsigned char)c))
|
||||
+ if (! isblank ((unsigned char)c))
|
||||
continue;
|
||||
|
||||
++wordi;
|
||||
|
||||
- while (isspace ((unsigned char)*t))
|
||||
+ while (isblank ((unsigned char)*t))
|
||||
++t;
|
||||
}
|
Loading…
Reference in New Issue
Block a user