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