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 7378C1382C5 for ; Sun, 31 Dec 2017 21:49:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 63911E08E5; Sun, 31 Dec 2017 21:49:16 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 341A4E08E5 for ; Sun, 31 Dec 2017 21:49:16 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 80ED0335C08 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 199BF126 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: <1514756886.00ed64aebc52061bedaaf0511b041f388315beb9.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/ncurses/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-libs/ncurses/ncurses-5.9-r101.ebuild sys-libs/ncurses/ncurses-6.0-r1.ebuild X-VCS-Directories: sys-libs/ncurses/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 00ed64aebc52061bedaaf0511b041f388315beb9 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: 6ad99bc3-8cfb-4d76-a6e2-a92cc1ef537e X-Archives-Hash: e2ea0431b8c50192d3af7e516a0db1ff commit: 00ed64aebc52061bedaaf0511b041f388315beb9 Author: Michał Górny gentoo org> AuthorDate: Sun Dec 31 09:48:51 2017 +0000 Commit: Michał Górny gentoo org> CommitDate: Sun Dec 31 21:48:06 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00ed64ae sys-libs/ncurses: 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-libs/ncurses/ncurses-5.9-r101.ebuild | 11 ++++------- sys-libs/ncurses/ncurses-6.0-r1.ebuild | 9 +++------ 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/sys-libs/ncurses/ncurses-5.9-r101.ebuild b/sys-libs/ncurses/ncurses-5.9-r101.ebuild index 76b8a76d3a7..c722d68f320 100644 --- a/sys-libs/ncurses/ncurses-5.9-r101.ebuild +++ b/sys-libs/ncurses/ncurses-5.9-r101.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # This version is just for the ABI .5 library EAPI="5" -inherit eutils toolchain-funcs multilib-minimal multiprocessing +inherit eutils toolchain-funcs multilib-minimal MY_PV=${PV:0:3} MY_P=${PN}-${MY_PV} @@ -55,8 +55,6 @@ src_configure() { $(usex unicode 'ncursesw' '') ) - multijob_init - # When installing ncurses, we have to use a compatible version of tic. # This comes up when cross-compiling, doing multilib builds, upgrading, # or installing for the first time. Build a local copy of tic whenever @@ -69,16 +67,15 @@ src_configure() { CXXFLAGS=${BUILD_CXXFLAGS} \ CPPFLAGS=${BUILD_CPPFLAGS} \ LDFLAGS="${BUILD_LDFLAGS} -static" \ - multijob_child_init do_configure cross --without-shared --with-normal + do_configure cross --without-shared --with-normal fi multilib-minimal_src_configure - multijob_finish } multilib_src_configure() { local t for t in "${NCURSES_TARGETS[@]}" ; do - multijob_child_init do_configure "${t}" + do_configure "${t}" done } diff --git a/sys-libs/ncurses/ncurses-6.0-r1.ebuild b/sys-libs/ncurses/ncurses-6.0-r1.ebuild index 2ab63de41d4..d98b23afb75 100644 --- a/sys-libs/ncurses/ncurses-6.0-r1.ebuild +++ b/sys-libs/ncurses/ncurses-6.0-r1.ebuild @@ -3,7 +3,7 @@ EAPI="5" -inherit eutils flag-o-matic toolchain-funcs multilib-minimal multiprocessing +inherit eutils flag-o-matic toolchain-funcs multilib-minimal MY_PV=${PV:0:3} PV_SNAP=${PV:4} @@ -61,8 +61,6 @@ src_configure() { $(use unicode && usex threads 'ncursestw' '') ) - multijob_init - # When installing ncurses, we have to use a compatible version of tic. # This comes up when cross-compiling, doing multilib builds, upgrading, # or installing for the first time. Build a local copy of tic whenever @@ -87,16 +85,15 @@ src_configure() { CXXFLAGS=${BUILD_CXXFLAGS} \ CPPFLAGS=${BUILD_CPPFLAGS} \ LDFLAGS="${BUILD_LDFLAGS} ${lbuildflags}" \ - multijob_child_init do_configure cross --without-shared --with-normal + do_configure cross --without-shared --with-normal fi multilib-minimal_src_configure - multijob_finish } multilib_src_configure() { local t for t in "${NCURSES_TARGETS[@]}" ; do - multijob_child_init do_configure "${t}" + do_configure "${t}" done }