Add a patch for preserving -j across Makefile rebuild
This commit is contained in:
		
							parent
							
								
									2257aac321
								
							
						
					
					
						commit
						88ea1307f7
					
				
							
								
								
									
										30
									
								
								make-3.82-parallel-remake.patch
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										30
									
								
								make-3.82-parallel-remake.patch
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1,30 @@ | ||||
| Index: main.c
 | ||||
| ===================================================================
 | ||||
| RCS file: /sources/make/make/main.c,v | ||||
| retrieving revision 1.247 | ||||
| retrieving revision 1.246 | ||||
| diff -u -r1.247 -r1.246
 | ||||
| --- main.c	18 Sep 2011 23:39:26 -0000	1.247
 | ||||
| +++ main.c	29 Aug 2010 23:05:27 -0000	1.246
 | ||||
| @@ -2089,6 +2089,11 @@
 | ||||
|   | ||||
|            ++restarts; | ||||
|   | ||||
| +          /* If we're re-exec'ing the first make, put back the number of
 | ||||
| +             job slots so define_makefiles() will get it right.  */
 | ||||
| +          if (master_job_slots)
 | ||||
| +            job_slots = master_job_slots;
 | ||||
| +
 | ||||
|            /* Reset makeflags in case they were changed.  */ | ||||
|            { | ||||
|              const char *pv = define_makeflags (1, 1); | ||||
| @@ -2830,9 +2825,6 @@
 | ||||
|  		       && (*(unsigned int *) cs->value_ptr == | ||||
|  			   *(unsigned int *) cs->noarg_value)) | ||||
|  		ADD_FLAG ("", 0); /* Optional value omitted; see below.  */ | ||||
| -	      else if (cs->c == 'j')
 | ||||
| -		/* Special case for `-j'.  */
 | ||||
| -		ADD_FLAG ("1", 1);
 | ||||
|  	      else | ||||
|  		{ | ||||
|  		  char *buf = alloca (30); | ||||
| @ -3,7 +3,7 @@ Summary: A GNU tool which simplifies the build process for users | ||||
| Name: make | ||||
| Epoch: 1 | ||||
| Version: 3.82 | ||||
| Release: 6%{?dist} | ||||
| Release: 7%{?dist} | ||||
| License: GPLv2+ | ||||
| Group: Development/Tools | ||||
| URL: http://www.gnu.org/software/make/ | ||||
| @ -19,6 +19,8 @@ Patch8: make-3.82-jobserver.patch | ||||
| Patch9: make-3.82-bugfixes.patch | ||||
| Patch10: make-3.82-sort-blank.patch | ||||
| Patch11: make-3.82-copy-on-expand.patch | ||||
| # Uptream fix of https://savannah.gnu.org/bugs/?33873 | ||||
| Patch12: make-3.82-parallel-remake.patch | ||||
| BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) | ||||
| Requires(post): /sbin/install-info | ||||
| Requires(preun): /sbin/install-info | ||||
| @ -45,6 +47,7 @@ makefile. | ||||
| %patch9 -p1 | ||||
| %patch10 -p1 | ||||
| %patch11 -p1 | ||||
| %patch12 -p0 | ||||
| 
 | ||||
| %build | ||||
| %configure | ||||
| @ -87,6 +90,10 @@ fi | ||||
| %{_infodir}/*.info* | ||||
| 
 | ||||
| %changelog | ||||
| * Thu Nov  3 2011 Petr Machata <pmachata@redhat.com> - 1:3.82-7 | ||||
| - Add a patch for preserving -j across Makefile rebuild | ||||
| - Resolves: #698702 | ||||
| 
 | ||||
| * Tue May 12 2011 Lubomir Rintel <lkundrak@v3.sk> - 1:3.82-6 | ||||
| - Fix free-after-use with nested assignments (#703104) | ||||
| 
 | ||||
|  | ||||
		Loading…
	
		Reference in New Issue
	
	Block a user