diff options
author | James Meyer <james.meyer@operamail.com> | 2012-08-07 17:35:30 (GMT) |
---|---|---|
committer | James Meyer <james.meyer@operamail.com> | 2012-08-07 17:35:30 (GMT) |
commit | 4fe0a91dc41e4f497a8aa5497c21799060d5fddd (patch) | |
tree | 0f5c663035712d7b6441f4c93335d9bc22cc5029 /abs/core/make/make-3.82-makeflags.patch | |
parent | d09de6629ad05b3ad935ac79e7ed6c7fe46e3cf2 (diff) | |
download | linhes_pkgbuild-4fe0a91dc41e4f497a8aa5497c21799060d5fddd.zip linhes_pkgbuild-4fe0a91dc41e4f497a8aa5497c21799060d5fddd.tar.gz linhes_pkgbuild-4fe0a91dc41e4f497a8aa5497c21799060d5fddd.tar.bz2 |
make 3.82
-moved to core
Diffstat (limited to 'abs/core/make/make-3.82-makeflags.patch')
-rw-r--r-- | abs/core/make/make-3.82-makeflags.patch | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/abs/core/make/make-3.82-makeflags.patch b/abs/core/make/make-3.82-makeflags.patch new file mode 100644 index 0000000..3cba3c4 --- /dev/null +++ b/abs/core/make/make-3.82-makeflags.patch @@ -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); |