On Mon, 20 Mar 2017 20:35:52 +0100 Michał Górny <mgo...@gentoo.org> wrote:
CCing maintainer
> 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
>
>
--
Sergei
pgpOGvl6uhfxk.pgp
Description: Цифровая подпись OpenPGP
