[arch-commits] Commit in make/trunk (PKGBUILD make-3.82-makeflags.patch)

[Allan McRae]

    Date: Monday, September 12, 2011 @ 23:02:58
  Author: allan
Revision: 137948

upgpkg: make 3.82-4

fix issue with ignoring MAKEFLAGS

Added:
  make/trunk/make-3.82-makeflags.patch
Modified:
  make/trunk/PKGBUILD

---------------------------+
 PKGBUILD                  |   12 +++++++++---
 make-3.82-makeflags.patch |   36 ++++++++++++++++++++++++++++++++++++
 2 files changed, 45 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-09-12 23:26:47 UTC (rev 137947)
+++ PKGBUILD	2011-09-13 03:02:58 UTC (rev 137948)
@@ -4,7 +4,7 @@
 
 pkgname=make
 pkgver=3.82
-pkgrel=3
+pkgrel=4
 pkgdesc="GNU make utility to maintain groups of programs"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/make"
@@ -15,11 +15,13 @@
 source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.bz2
         bug30612.patch
         bug30723.patch
-        make-3.82-sort-blank.patch)
+        make-3.82-sort-blank.patch
+        make-3.82-makeflags.patch)
 md5sums=('1a11100f3c63fcf5753818e59d63088f'
          'c8f496b22191f9fb9420ab14c1a19a47'
          '662e6450e19a5acdaa5c9fcb8ad78dea'
-         '7d01a99f389d8f08dec93ed479071ee4')
+         '7d01a99f389d8f08dec93ed479071ee4'
+         'bc12ad4d0c6e6c0e72d9fb61054f446b')
 
 
 build() {
@@ -34,6 +36,10 @@
   # https://bugs.archlinux.org/task/22733 (fix from Fedora)
   patch -Np1 -i $srcdir/make-3.82-sort-blank.patch
   
+  # https://savannah.gnu.org/support/index.php?107487
+  # https://savannah.gnu.org/bugs/?33873
+  patch -Np0 -i $srcdir/make-3.82-makeflags.patch
+  
   ./configure --prefix=/usr
   make
 }

Added: make-3.82-makeflags.patch
===================================================================
--- make-3.82-makeflags.patch	                        (rev 0)
+++ make-3.82-makeflags.patch	2011-09-13 03:02:58 UTC (rev 137948)
@@ -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);