diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2013-01-19 01:51:23 +0000 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2013-01-19 01:51:23 +0000 |
| commit | 5fda8f6197780918d8fa639e3ef4213bf6057722 (patch) | |
| tree | 537901906fd06e257dfcc50cebd793ce94371827 /sys-boot/grub/files/grub-2.00-parallel-make.patch | |
| parent | Unmask new systemd after fixing the ebuild. (diff) | |
| download | historical-5fda8f6197780918d8fa639e3ef4213bf6057722.tar.gz historical-5fda8f6197780918d8fa639e3ef4213bf6057722.tar.bz2 historical-5fda8f6197780918d8fa639e3ef4213bf6057722.zip | |
Update parallel make patch to fix bulding of emu platform.
Package-Manager: portage-2.2.0_alpha154/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4
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.patch | 30 |
1 files changed, 26 insertions, 4 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 index 8af8b36d8ff7..03d634bb6406 100644 --- a/sys-boot/grub/files/grub-2.00-parallel-make.patch +++ b/sys-boot/grub/files/grub-2.00-parallel-make.patch @@ -1,16 +1,38 @@ Fix parallel make problems. -Upstream changesets 4547, 4552. +Upstream changesets 4547, 4552, 4578. --- gentpl.py +++ gentpl.py -@@ -487,7 +487,7 @@ - def manpage(): +@@ -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 +] grub-mkconfig_lib", """ ++ 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 @@ |