1 |
floppym 12/07/07 22:55:48 |
2 |
|
3 |
Added: grub-2.00-parallel-make.patch |
4 |
Removed: grub-2.00-manpage-race.patch |
5 |
Log: |
6 |
Add additional fix for bug 424231. |
7 |
|
8 |
(Portage version: 2.2.0_alpha116/cvs/Linux x86_64) |
9 |
|
10 |
Revision Changes Path |
11 |
1.1 sys-boot/grub/files/grub-2.00-parallel-make.patch |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/files/grub-2.00-parallel-make.patch?rev=1.1&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/files/grub-2.00-parallel-make.patch?rev=1.1&content-type=text/plain |
15 |
|
16 |
Index: grub-2.00-parallel-make.patch |
17 |
=================================================================== |
18 |
Fix parallel make problems. |
19 |
Upstream changesets 4547, 4552. |
20 |
--- gentpl.py |
21 |
+++ gentpl.py |
22 |
@@ -487,7 +487,7 @@ |
23 |
def manpage(): |
24 |
r = "if COND_MAN_PAGES\n" |
25 |
r += gvar_add("man_MANS", "[+ name +].[+ mansection +]\n") |
26 |
- r += rule("[+ name +].[+ mansection +]", "[+ name +]", """ |
27 |
+ r += rule("[+ name +].[+ mansection +]", "[+ name +] grub-mkconfig_lib", """ |
28 |
chmod a+x [+ name +] |
29 |
PATH=$(builddir):$$PATH pkgdatadir=$(builddir) $(HELP2MAN) --section=[+ mansection +] -i $(top_srcdir)/docs/man/[+ name +].h2m -o $@ [+ name +] |
30 |
""") |
31 |
--- grub-core/Makefile.am |
32 |
+++ grub-core/Makefile.am |
33 |
@@ -63,7 +63,7 @@ |
34 |
rs_decoder.S: $(srcdir)/lib/reed_solomon.c |
35 |
$(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) -Os -I$(top_builddir) -S -DSTANDALONE -o $@ $< -g0 -mregparm=3 -ffreestanding |
36 |
|
37 |
-kern/i386/pc/startup.S: $(builddir)/rs_decoder.S |
38 |
+boot/i386/pc/startup_raw.S: $(builddir)/rs_decoder.S |
39 |
boot/mips/loongson/fwstart.S: $(builddir)/sm712_start.S |
40 |
|
41 |
CLEANFILES += grub_script.yy.c grub_script.yy.h |