summaryrefslogtreecommitdiff
path: root/sys-boot/grub/files/grub-2.00-parallel-make.patch
diff options
context:
space:
mode:
authorBlackNoxis <steven.darklight@gmail.com>2014-02-15 23:24:26 +0200
committerBlackNoxis <steven.darklight@gmail.com>2014-02-15 23:24:26 +0200
commit7224c1253228e5c29c78cb3f0f26ce34770f2356 (patch)
tree1684924656132935256e034f35f92abee6623265 /sys-boot/grub/files/grub-2.00-parallel-make.patch
Added ebuilds for kogaion desktop
Diffstat (limited to 'sys-boot/grub/files/grub-2.00-parallel-make.patch')
-rw-r--r--sys-boot/grub/files/grub-2.00-parallel-make.patch46
1 files changed, 46 insertions, 0 deletions
diff --git a/sys-boot/grub/files/grub-2.00-parallel-make.patch b/sys-boot/grub/files/grub-2.00-parallel-make.patch
new file mode 100644
index 00000000..03d634bb
--- /dev/null
+++ b/sys-boot/grub/files/grub-2.00-parallel-make.patch
@@ -0,0 +1,46 @@
+Fix parallel make problems.
+Upstream changesets 4547, 4552, 4578.
+--- gentpl.py
++++ gentpl.py
+@@ -484,10 +484,10 @@
+ def installdir(default="bin"):
+ return "[+ IF installdir +][+ installdir +][+ ELSE +]" + default + "[+ ENDIF +]"
+
+-def manpage():
++def manpage(adddeps):
+ r = "if COND_MAN_PAGES\n"
+ r += gvar_add("man_MANS", "[+ name +].[+ mansection +]\n")
+- r += rule("[+ name +].[+ mansection +]", "[+ name +]", """
++ r += rule("[+ name +].[+ mansection +]", "[+ name +] " + adddeps, """
+ chmod a+x [+ name +]
+ PATH=$(builddir):$$PATH pkgdatadir=$(builddir) $(HELP2MAN) --section=[+ mansection +] -i $(top_srcdir)/docs/man/[+ name +].h2m -o $@ [+ name +]
+ """)
+@@ -503,7 +503,7 @@
+ r += gvar_add("TESTS", "[+ name +]")
+ r += "[+ ELSE +]"
+ r += var_add(installdir() + "_PROGRAMS", "[+ name +]")
+- r += "[+ IF mansection +]" + manpage() + "[+ ENDIF +]"
++ r += "[+ IF mansection +]" + manpage("") + "[+ ENDIF +]"
+ r += "[+ ENDIF +]"
+
+ r += var_set(cname() + "_SOURCES", platform_sources(platform))
+@@ -532,7 +532,7 @@
+ r += gvar_add ("TESTS", "[+ name +]")
+ r += "[+ ELSE +]"
+ r += var_add(installdir() + "_SCRIPTS", "[+ name +]")
+- r += "[+ IF mansection +]" + manpage() + "[+ ENDIF +]"
++ r += "[+ IF mansection +]" + manpage("grub-mkconfig_lib") + "[+ ENDIF +]"
+ r += "[+ ENDIF +]"
+
+ r += rule("[+ name +]", platform_sources(platform) + " $(top_builddir)/config.status", """
+--- grub-core/Makefile.am
++++ grub-core/Makefile.am
+@@ -63,7 +63,7 @@
+ rs_decoder.S: $(srcdir)/lib/reed_solomon.c
+ $(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) -Os -I$(top_builddir) -S -DSTANDALONE -o $@ $< -g0 -mregparm=3 -ffreestanding
+
+-kern/i386/pc/startup.S: $(builddir)/rs_decoder.S
++boot/i386/pc/startup_raw.S: $(builddir)/rs_decoder.S
+ boot/mips/loongson/fwstart.S: $(builddir)/sm712_start.S
+
+ CLEANFILES += grub_script.yy.c grub_script.yy.h