Gentoo Archives: gentoo-dev

From: "Michał Górny" <mgorny@g.o>
To: gentoo-dev@l.g.o
Cc: "Michał Górny" <mgorny@g.o>
Subject: [gentoo-dev] [PATCH 2/2] sys-libs/ncurses: Remove parallel econf logic
Date: Mon, 20 Mar 2017 19:37:05
Message-Id: 20170320193552.32500-2-mgorny@gentoo.org
In Reply to: [gentoo-dev] [PATCH 1/2] dev-lang/jimtcl: Remove parallel econf code by "Michał Górny"
1 Remove the parallel econf logic that adds a lot of complexity for minor
2 gain. It results in the output from different configure scripts being
3 mixed in the build log, making it unreadable. It causes econf to be run
4 in a subshell which is a PMS violation and can cause issues with some of
5 package manager implementations. Furthermore, the multijob parallel
6 processes are interleaved with multilib-build logic which is unsupported
7 and a very bad idea.
8 ---
9 sys-libs/ncurses/ncurses-5.9-r101.ebuild | 11 ++++-------
10 sys-libs/ncurses/ncurses-6.0-r1.ebuild | 9 +++------
11 2 files changed, 7 insertions(+), 13 deletions(-)
12
13 diff --git a/sys-libs/ncurses/ncurses-5.9-r101.ebuild b/sys-libs/ncurses/ncurses-5.9-r101.ebuild
14 index 76b8a76d3a72..c722d68f3208 100644
15 --- a/sys-libs/ncurses/ncurses-5.9-r101.ebuild
16 +++ b/sys-libs/ncurses/ncurses-5.9-r101.ebuild
17 @@ -1,11 +1,11 @@
18 -# Copyright 1999-2015 Gentoo Foundation
19 +# Copyright 1999-2017 Gentoo Foundation
20 # Distributed under the terms of the GNU General Public License v2
21
22 # This version is just for the ABI .5 library
23
24 EAPI="5"
25
26 -inherit eutils toolchain-funcs multilib-minimal multiprocessing
27 +inherit eutils toolchain-funcs multilib-minimal
28
29 MY_PV=${PV:0:3}
30 MY_P=${PN}-${MY_PV}
31 @@ -55,8 +55,6 @@ src_configure() {
32 $(usex unicode 'ncursesw' '')
33 )
34
35 - multijob_init
36 -
37 # When installing ncurses, we have to use a compatible version of tic.
38 # This comes up when cross-compiling, doing multilib builds, upgrading,
39 # or installing for the first time. Build a local copy of tic whenever
40 @@ -69,16 +67,15 @@ src_configure() {
41 CXXFLAGS=${BUILD_CXXFLAGS} \
42 CPPFLAGS=${BUILD_CPPFLAGS} \
43 LDFLAGS="${BUILD_LDFLAGS} -static" \
44 - multijob_child_init do_configure cross --without-shared --with-normal
45 + do_configure cross --without-shared --with-normal
46 fi
47 multilib-minimal_src_configure
48 - multijob_finish
49 }
50
51 multilib_src_configure() {
52 local t
53 for t in "${NCURSES_TARGETS[@]}" ; do
54 - multijob_child_init do_configure "${t}"
55 + do_configure "${t}"
56 done
57 }
58
59 diff --git a/sys-libs/ncurses/ncurses-6.0-r1.ebuild b/sys-libs/ncurses/ncurses-6.0-r1.ebuild
60 index 2ab63de41d4c..d98b23afb751 100644
61 --- a/sys-libs/ncurses/ncurses-6.0-r1.ebuild
62 +++ b/sys-libs/ncurses/ncurses-6.0-r1.ebuild
63 @@ -3,7 +3,7 @@
64
65 EAPI="5"
66
67 -inherit eutils flag-o-matic toolchain-funcs multilib-minimal multiprocessing
68 +inherit eutils flag-o-matic toolchain-funcs multilib-minimal
69
70 MY_PV=${PV:0:3}
71 PV_SNAP=${PV:4}
72 @@ -61,8 +61,6 @@ src_configure() {
73 $(use unicode && usex threads 'ncursestw' '')
74 )
75
76 - multijob_init
77 -
78 # When installing ncurses, we have to use a compatible version of tic.
79 # This comes up when cross-compiling, doing multilib builds, upgrading,
80 # or installing for the first time. Build a local copy of tic whenever
81 @@ -87,16 +85,15 @@ src_configure() {
82 CXXFLAGS=${BUILD_CXXFLAGS} \
83 CPPFLAGS=${BUILD_CPPFLAGS} \
84 LDFLAGS="${BUILD_LDFLAGS} ${lbuildflags}" \
85 - multijob_child_init do_configure cross --without-shared --with-normal
86 + do_configure cross --without-shared --with-normal
87 fi
88 multilib-minimal_src_configure
89 - multijob_finish
90 }
91
92 multilib_src_configure() {
93 local t
94 for t in "${NCURSES_TARGETS[@]}" ; do
95 - multijob_child_init do_configure "${t}"
96 + do_configure "${t}"
97 done
98 }
99
100 --
101 2.12.0

Replies