| 1 |
vapier 10/01/09 03:50:40 |
| 2 |
|
| 3 |
Modified: bash-4.0-parallel-build.patch |
| 4 |
Added: bash-4.1-parallel-build.patch |
| 5 |
Log: |
| 6 |
Fix parallel build in glob dir #300143 by Tiago Pereira. |
| 7 |
(Portage version: 2.2_rc61/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.3 app-shells/bash/files/bash-4.0-parallel-build.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-shells/bash/files/bash-4.0-parallel-build.patch?rev=1.3&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-shells/bash/files/bash-4.0-parallel-build.patch?rev=1.3&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-shells/bash/files/bash-4.0-parallel-build.patch?r1=1.2&r2=1.3 |
| 15 |
|
| 16 |
Index: bash-4.0-parallel-build.patch |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/app-shells/bash/files/bash-4.0-parallel-build.patch,v |
| 19 |
retrieving revision 1.2 |
| 20 |
retrieving revision 1.3 |
| 21 |
diff -u -r1.2 -r1.3 |
| 22 |
--- bash-4.0-parallel-build.patch 15 Oct 2009 17:48:17 -0000 1.2 |
| 23 |
+++ bash-4.0-parallel-build.patch 9 Jan 2010 03:50:39 -0000 1.3 |
| 24 |
@@ -35,3 +35,31 @@ |
| 25 |
# rules for losing makes, like SunOS |
| 26 |
casemod.o: casemod.c |
| 27 |
clktck.o: clktck.c |
| 28 |
+ |
| 29 |
+http://bugs.gentoo.org/300143 |
| 30 |
+ |
| 31 |
+and another ... |
| 32 |
+ |
| 33 |
+--- bash-4.0/lib/glob/Makefile.in |
| 34 |
++++ bash-4.0/lib/glob/Makefile.in |
| 35 |
+@@ -119,6 +119,11 @@ |
| 36 |
+ mostlyclean: clean |
| 37 |
+ -( cd doc && $(MAKE) $(MFLAGS) $@ ) |
| 38 |
+ |
| 39 |
++# Dependencies |
| 40 |
++ |
| 41 |
++${BUILD_DIR}/pathnames.h: ${BUILD_DIR}/config.h ${BUILD_DIR}/Makefile Makefile |
| 42 |
++ -( cd ${BUILD_DIR} && ${MAKE} ${MFLAGS} pathnames.h ) |
| 43 |
++ |
| 44 |
+ ###################################################################### |
| 45 |
+ # # |
| 46 |
+ # Dependencies for the object files which make up this library. # |
| 47 |
+@@ -136,7 +141,7 @@ |
| 48 |
+ strmatch.o: $(BUILD_DIR)/config.h |
| 49 |
+ strmatch.o: $(BASHINCDIR)/stdc.h |
| 50 |
+ |
| 51 |
+-glob.o: $(BUILD_DIR)/config.h |
| 52 |
++glob.o: $(BUILD_DIR)/config.h $(topdir)/shell.h $(BUILD_DIR)/pathnames.h |
| 53 |
+ glob.o: $(topdir)/bashtypes.h $(BASHINCDIR)/ansi_stdlib.h $(topdir)/bashansi.h |
| 54 |
+ glob.o: $(BASHINCDIR)/posixstat.h $(BASHINCDIR)/memalloc.h |
| 55 |
+ glob.o: strmatch.h glob.h |
| 56 |
|
| 57 |
|
| 58 |
|
| 59 |
1.1 app-shells/bash/files/bash-4.1-parallel-build.patch |
| 60 |
|
| 61 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-shells/bash/files/bash-4.1-parallel-build.patch?rev=1.1&view=markup |
| 62 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-shells/bash/files/bash-4.1-parallel-build.patch?rev=1.1&content-type=text/plain |
| 63 |
|
| 64 |
Index: bash-4.1-parallel-build.patch |
| 65 |
=================================================================== |
| 66 |
--- bash-4.1/lib/glob/Makefile.in |
| 67 |
+++ bash-4.1/lib/glob/Makefile.in |
| 68 |
@@ -119,6 +119,11 @@ |
| 69 |
mostlyclean: clean |
| 70 |
-( cd doc && $(MAKE) $(MFLAGS) $@ ) |
| 71 |
|
| 72 |
+# Dependencies |
| 73 |
+ |
| 74 |
+${BUILD_DIR}/pathnames.h: ${BUILD_DIR}/config.h ${BUILD_DIR}/Makefile Makefile |
| 75 |
+ -( cd ${BUILD_DIR} && ${MAKE} ${MFLAGS} pathnames.h ) |
| 76 |
+ |
| 77 |
###################################################################### |
| 78 |
# # |
| 79 |
# Dependencies for the object files which make up this library. # |
| 80 |
@@ -136,7 +141,7 @@ |
| 81 |
strmatch.o: $(BUILD_DIR)/config.h |
| 82 |
strmatch.o: $(BASHINCDIR)/stdc.h |
| 83 |
|
| 84 |
-glob.o: $(BUILD_DIR)/config.h |
| 85 |
+glob.o: $(BUILD_DIR)/config.h $(topdir)/shell.h $(BUILD_DIR)/pathnames.h |
| 86 |
glob.o: $(topdir)/bashtypes.h $(BASHINCDIR)/ansi_stdlib.h $(topdir)/bashansi.h |
| 87 |
glob.o: $(BASHINCDIR)/posixstat.h $(BASHINCDIR)/memalloc.h |
| 88 |
glob.o: strmatch.h glob.h |
Archives