From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1D0AB138206 for ; Sun, 31 Dec 2017 21:49:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4CB28E08DC; Sun, 31 Dec 2017 21:49:16 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 14DB2E08DC for ; Sun, 31 Dec 2017 21:49:16 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E283A335C2C for ; Sun, 31 Dec 2017 21:49:14 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6701C199 for ; Sun, 31 Dec 2017 21:49:13 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1514756925.2df3277cb07eb3cddca3d3280a256394fb069e93.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-boot/grub/grub-0.97-r16.ebuild sys-boot/grub/grub-0.97-r18.ebuild X-VCS-Directories: sys-boot/grub/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 2df3277cb07eb3cddca3d3280a256394fb069e93 X-VCS-Branch: master Date: Sun, 31 Dec 2017 21:49:13 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: dc66f227-1623-438b-bf10-c0b15bd17bc9 X-Archives-Hash: 5492f2aad11c4e59dea23b986243ce2a commit: 2df3277cb07eb3cddca3d3280a256394fb069e93 Author: Michał Górny gentoo org> AuthorDate: Sun Dec 31 10:24:21 2017 +0000 Commit: Michał Górny gentoo org> CommitDate: Sun Dec 31 21:48:45 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2df3277c sys-boot/grub: Stop using awful multijob_* logic The multijob logic adds a lot of complex, unmaintained and fragile bash code with little gain. Moreover, makes build logs unreadable by interspersing output from multiple configure runs. Bug: https://bugs.gentoo.org/613322 sys-boot/grub/grub-0.97-r16.ebuild | 10 +--------- sys-boot/grub/grub-0.97-r18.ebuild | 10 +--------- 2 files changed, 2 insertions(+), 18 deletions(-) diff --git a/sys-boot/grub/grub-0.97-r16.ebuild b/sys-boot/grub/grub-0.97-r16.ebuild index 06d9aa23b12..22793c03ab0 100644 --- a/sys-boot/grub/grub-0.97-r16.ebuild +++ b/sys-boot/grub/grub-0.97-r16.ebuild @@ -17,7 +17,7 @@ EAPI="5" -inherit eutils mount-boot toolchain-funcs linux-info flag-o-matic autotools pax-utils multiprocessing +inherit eutils mount-boot toolchain-funcs linux-info flag-o-matic autotools pax-utils PATCHVER="1.14" # Should match the revision ideally DESCRIPTION="GNU GRUB Legacy boot loader" @@ -121,12 +121,8 @@ src_configure() { fi fi - multijob_init - # build the net-bootable grub first, but only if "netboot" is set if use netboot ; then - ( - multijob_child_init mkdir -p "${WORKDIR}"/netboot pushd "${WORKDIR}"/netboot >/dev/null ECONF_SOURCE=${S} \ @@ -141,8 +137,6 @@ src_configure() { --enable-{ne,ns8390,wd,otulip,rtl8139,sis900,sk-g16,smc9000,tiara} \ --enable-{tulip,via-rhine,w89c840} popd >/dev/null - ) & - multijob_post_fork fi # Now build the regular grub @@ -156,8 +150,6 @@ src_configure() { # sanity check due to common failure use ncurses && ! grep -qs "HAVE_LIBCURSES.*1" config.h && die "USE=ncurses but curses not found" - - multijob_finish } src_compile() { diff --git a/sys-boot/grub/grub-0.97-r18.ebuild b/sys-boot/grub/grub-0.97-r18.ebuild index eb820606143..9d5aeede689 100644 --- a/sys-boot/grub/grub-0.97-r18.ebuild +++ b/sys-boot/grub/grub-0.97-r18.ebuild @@ -17,7 +17,7 @@ EAPI="6" -inherit eutils mount-boot toolchain-funcs linux-info flag-o-matic autotools pax-utils multiprocessing +inherit eutils mount-boot toolchain-funcs linux-info flag-o-matic autotools pax-utils PATCHVER="1.15" # Should match the revision ideally DESCRIPTION="GNU GRUB Legacy boot loader" @@ -121,12 +121,8 @@ src_configure() { fi fi - multijob_init - # build the net-bootable grub first, but only if "netboot" is set if use netboot ; then - ( - multijob_child_init mkdir -p "${WORKDIR}"/netboot pushd "${WORKDIR}"/netboot >/dev/null ECONF_SOURCE=${S} \ @@ -141,8 +137,6 @@ src_configure() { --enable-{ne,ns8390,wd,otulip,rtl8139,sis900,sk-g16,smc9000,tiara} \ --enable-{tulip,via-rhine,w89c840} popd >/dev/null - ) & - multijob_post_fork fi # Now build the regular grub @@ -156,8 +150,6 @@ src_configure() { # sanity check due to common failure use ncurses && ! grep -qs "HAVE_LIBCURSES.*1" config.h && die "USE=ncurses but curses not found" - - multijob_finish } src_compile() {