Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
Date: Sun, 31 Dec 2017 21:49:19
Message-Id: 1514756925.2df3277cb07eb3cddca3d3280a256394fb069e93.mgorny@gentoo
1 commit: 2df3277cb07eb3cddca3d3280a256394fb069e93
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sun Dec 31 10:24:21 2017 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sun Dec 31 21:48:45 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2df3277c
7
8 sys-boot/grub: Stop using awful multijob_* logic
9
10 The multijob logic adds a lot of complex, unmaintained and fragile bash
11 code with little gain. Moreover, makes build logs unreadable
12 by interspersing output from multiple configure runs.
13
14 Bug: https://bugs.gentoo.org/613322
15
16 sys-boot/grub/grub-0.97-r16.ebuild | 10 +---------
17 sys-boot/grub/grub-0.97-r18.ebuild | 10 +---------
18 2 files changed, 2 insertions(+), 18 deletions(-)
19
20 diff --git a/sys-boot/grub/grub-0.97-r16.ebuild b/sys-boot/grub/grub-0.97-r16.ebuild
21 index 06d9aa23b12..22793c03ab0 100644
22 --- a/sys-boot/grub/grub-0.97-r16.ebuild
23 +++ b/sys-boot/grub/grub-0.97-r16.ebuild
24 @@ -17,7 +17,7 @@
25
26 EAPI="5"
27
28 -inherit eutils mount-boot toolchain-funcs linux-info flag-o-matic autotools pax-utils multiprocessing
29 +inherit eutils mount-boot toolchain-funcs linux-info flag-o-matic autotools pax-utils
30
31 PATCHVER="1.14" # Should match the revision ideally
32 DESCRIPTION="GNU GRUB Legacy boot loader"
33 @@ -121,12 +121,8 @@ src_configure() {
34 fi
35 fi
36
37 - multijob_init
38 -
39 # build the net-bootable grub first, but only if "netboot" is set
40 if use netboot ; then
41 - (
42 - multijob_child_init
43 mkdir -p "${WORKDIR}"/netboot
44 pushd "${WORKDIR}"/netboot >/dev/null
45 ECONF_SOURCE=${S} \
46 @@ -141,8 +137,6 @@ src_configure() {
47 --enable-{ne,ns8390,wd,otulip,rtl8139,sis900,sk-g16,smc9000,tiara} \
48 --enable-{tulip,via-rhine,w89c840}
49 popd >/dev/null
50 - ) &
51 - multijob_post_fork
52 fi
53
54 # Now build the regular grub
55 @@ -156,8 +150,6 @@ src_configure() {
56
57 # sanity check due to common failure
58 use ncurses && ! grep -qs "HAVE_LIBCURSES.*1" config.h && die "USE=ncurses but curses not found"
59 -
60 - multijob_finish
61 }
62
63 src_compile() {
64
65 diff --git a/sys-boot/grub/grub-0.97-r18.ebuild b/sys-boot/grub/grub-0.97-r18.ebuild
66 index eb820606143..9d5aeede689 100644
67 --- a/sys-boot/grub/grub-0.97-r18.ebuild
68 +++ b/sys-boot/grub/grub-0.97-r18.ebuild
69 @@ -17,7 +17,7 @@
70
71 EAPI="6"
72
73 -inherit eutils mount-boot toolchain-funcs linux-info flag-o-matic autotools pax-utils multiprocessing
74 +inherit eutils mount-boot toolchain-funcs linux-info flag-o-matic autotools pax-utils
75
76 PATCHVER="1.15" # Should match the revision ideally
77 DESCRIPTION="GNU GRUB Legacy boot loader"
78 @@ -121,12 +121,8 @@ src_configure() {
79 fi
80 fi
81
82 - multijob_init
83 -
84 # build the net-bootable grub first, but only if "netboot" is set
85 if use netboot ; then
86 - (
87 - multijob_child_init
88 mkdir -p "${WORKDIR}"/netboot
89 pushd "${WORKDIR}"/netboot >/dev/null
90 ECONF_SOURCE=${S} \
91 @@ -141,8 +137,6 @@ src_configure() {
92 --enable-{ne,ns8390,wd,otulip,rtl8139,sis900,sk-g16,smc9000,tiara} \
93 --enable-{tulip,via-rhine,w89c840}
94 popd >/dev/null
95 - ) &
96 - multijob_post_fork
97 fi
98
99 # Now build the regular grub
100 @@ -156,8 +150,6 @@ src_configure() {
101
102 # sanity check due to common failure
103 use ncurses && ! grep -qs "HAVE_LIBCURSES.*1" config.h && die "USE=ncurses but curses not found"
104 -
105 - multijob_finish
106 }
107
108 src_compile() {