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 4/4] sys-apps/systemd: Use eninja from ninja-utils
Date: Sun, 30 Apr 2017 20:30:27
Message-Id: 20170430202830.12974-4-mgorny@gentoo.org
In Reply to: [gentoo-dev] [PATCH 1/4] ninja-utils.eclass: Add a new eclass to handle calling ninja by "Michał Górny"
1 ---
2 sys-apps/systemd/systemd-9999.ebuild | 11 +----------
3 1 file changed, 1 insertion(+), 10 deletions(-)
4
5 diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
6 index 7ff69d75cc9a..b4e1f943a599 100644
7 --- a/sys-apps/systemd/systemd-9999.ebuild
8 +++ b/sys-apps/systemd/systemd-9999.ebuild
9 @@ -13,7 +13,7 @@ fi
10
11 PYTHON_COMPAT=( python{3_4,3_5,3_6} )
12
13 -inherit bash-completion-r1 linux-info multilib-minimal multiprocessing pam python-any-r1 systemd toolchain-funcs udev user
14 +inherit bash-completion-r1 linux-info multilib-minimal ninja-utils pam python-any-r1 systemd toolchain-funcs udev user
15
16 DESCRIPTION="System and service manager for Linux"
17 HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
18 @@ -271,15 +271,6 @@ multilib_src_configure() {
19 "$@" || die
20 }
21
22 -eninja() {
23 - if [[ -z ${NINJAOPTS+set} ]]; then
24 - NINJAOPTS="-j $(makeopts_jobs) -l $(makeopts_loadavg "${MAKEOPTS}" 0)"
25 - fi
26 - set -- ninja -v ${NINJAOPTS} "$@"
27 - echo "$@"
28 - "$@" || die
29 -}
30 -
31 multilib_src_compile() {
32 eninja
33 }
34 --
35 2.13.0.rc1