diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2013-01-19 01:51:20 +0000 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2013-01-19 01:51:20 +0000 |
| commit | 9b28626cb2e806d6414229bbecd2dee3f9a05cd2 (patch) | |
| tree | b2bcf642ac68936ff9158f9b64ef60cda5ac6661 /sys-boot | |
| parent | Unmask new systemd after fixing the ebuild. (diff) | |
| download | gentoo-2-9b28626cb2e806d6414229bbecd2dee3f9a05cd2.tar.gz gentoo-2-9b28626cb2e806d6414229bbecd2dee3f9a05cd2.tar.bz2 gentoo-2-9b28626cb2e806d6414229bbecd2dee3f9a05cd2.zip | |
Update parallel make patch to fix bulding of emu platform.
(Portage version: 2.2.0_alpha154/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)
Diffstat (limited to 'sys-boot')
| -rw-r--r-- | sys-boot/grub/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-boot/grub/files/grub-2.00-parallel-make.patch | 30 |
2 files changed, 31 insertions, 5 deletions
diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog index ff3eefd66394..a10b58ac2290 100644 --- a/sys-boot/grub/ChangeLog +++ b/sys-boot/grub/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-boot/grub # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.246 2013/01/13 19:43:16 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.247 2013/01/19 01:51:20 floppym Exp $ + + 19 Jan 2013; Mike Gilbert <floppym@gentoo.org> + files/grub-2.00-parallel-make.patch: + Update parallel make patch to fix bulding of emu platform. 13 Jan 2013; Mike Gilbert <floppym@gentoo.org> grub-2.00-r1.ebuild: Fix dependency on xz-utils, reported by onox. 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 @@ |