Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/
Date: Tue, 09 Oct 2018 20:00:19
Message-Id: 1539115181.d15df4e625dadba62838a9b0ab5e1ffa88715db3.mgorny@gentoo
1 commit: d15df4e625dadba62838a9b0ab5e1ffa88715db3
2 Author: ktrace <ktrace <AT> yandex <DOT> ru>
3 AuthorDate: Sat Sep 22 12:53:16 2018 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Tue Oct 9 19:59:41 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d15df4e6
7
8 waf-utils.eclass: add parameters to compile and install
9
10 Signed-off-by: Victor Kustov <ktrace <AT> yandex.ru>
11 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
12
13 eclass/waf-utils.eclass | 10 +++++-----
14 1 file changed, 5 insertions(+), 5 deletions(-)
15
16 diff --git a/eclass/waf-utils.eclass b/eclass/waf-utils.eclass
17 index 4d02483a927..878068fc9f4 100644
18 --- a/eclass/waf-utils.eclass
19 +++ b/eclass/waf-utils.eclass
20 @@ -89,7 +89,7 @@ waf-utils_src_configure() {
21 CCFLAGS="${CFLAGS}" LINKFLAGS="${CFLAGS} ${LDFLAGS}" "${WAF_BINARY}" \
22 "--prefix=${EPREFIX}/usr" \
23 "${libdir[@]}" \
24 - "$@" \
25 + "${@}" \
26 configure || die "configure failed"
27 }
28
29 @@ -102,8 +102,8 @@ waf-utils_src_compile() {
30 [[ ${WAF_VERBOSE} == ON ]] && _mywafconfig="--verbose"
31
32 local jobs="--jobs=$(makeopts_jobs)"
33 - echo "\"${WAF_BINARY}\" build ${_mywafconfig} ${jobs}"
34 - "${WAF_BINARY}" ${_mywafconfig} ${jobs} || die "build failed"
35 + echo "\"${WAF_BINARY}\" build ${_mywafconfig} ${jobs} ${*}"
36 + "${WAF_BINARY}" ${_mywafconfig} ${jobs} "${@}" || die "build failed"
37 }
38
39 # @FUNCTION: waf-utils_src_install
40 @@ -112,8 +112,8 @@ waf-utils_src_compile() {
41 waf-utils_src_install() {
42 debug-print-function ${FUNCNAME} "$@"
43
44 - echo "\"${WAF_BINARY}\" --destdir=\"${D}\" install"
45 - "${WAF_BINARY}" --destdir="${D}" install || die "Make install failed"
46 + echo "\"${WAF_BINARY}\" --destdir=\"${D}\" ${*} install"
47 + "${WAF_BINARY}" --destdir="${D}" "${@}" install || die "Make install failed"
48
49 # Manual document installation
50 einstalldocs