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 2FED9139694 for ; Mon, 20 Mar 2017 19:37:05 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A93AB21C268; Mon, 20 Mar 2017 19:36:08 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5C0B721C25B for ; Mon, 20 Mar 2017 19:36:08 +0000 (UTC) Received: from localhost.localdomain (d202-252.icpnet.pl [109.173.202.252]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: mgorny) by smtp.gentoo.org (Postfix) with ESMTPSA id EC08F340AD2; Mon, 20 Mar 2017 19:36:06 +0000 (UTC) From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= To: gentoo-dev@lists.gentoo.org Cc: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Subject: [gentoo-dev] [PATCH 2/2] sys-libs/ncurses: Remove parallel econf logic Date: Mon, 20 Mar 2017 20:35:52 +0100 Message-Id: <20170320193552.32500-2-mgorny@gentoo.org> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20170320193552.32500-1-mgorny@gentoo.org> References: <20170320193552.32500-1-mgorny@gentoo.org> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-dev@lists.gentoo.org Reply-to: gentoo-dev@lists.gentoo.org X-Archives-Salt: a8d6b1bf-524b-4876-a0ac-95323c24600f X-Archives-Hash: ee1712171dc4e8ec9f84680d4d302b24 Remove the parallel econf logic that adds a lot of complexity for minor gain. It results in the output from different configure scripts being mixed in the build log, making it unreadable. It causes econf to be run in a subshell which is a PMS violation and can cause issues with some of package manager implementations. Furthermore, the multijob parallel processes are interleaved with multilib-build logic which is unsupported and a very bad idea. --- 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 76b8a76d3a72..c722d68f3208 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 2ab63de41d4c..d98b23afb751 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 } -- 2.12.0