1 |
On Fri, 2018-09-21 at 18:51 +0300, Victor Kustov wrote: |
2 |
> [1] https://github.com/gentoo/gentoo/pull/9533#discussion_r211739558 |
3 |
> |
4 |
> This patch add parameters to compile and install phases in waf-utils |
5 |
> eclass. Need to solve [1] |
6 |
> |
7 |
> --- |
8 |
> eclass/waf-utils.eclass | 8 ++++---- |
9 |
> 1 file changed, 4 insertions(+), 4 deletions(-) |
10 |
> |
11 |
> diff --git a/eclass/waf-utils.eclass b/eclass/waf-utils.eclass |
12 |
> index 4d02483a927..33515b883b5 100644 |
13 |
> --- a/eclass/waf-utils.eclass |
14 |
> +++ b/eclass/waf-utils.eclass |
15 |
> @@ -102,8 +102,8 @@ waf-utils_src_compile() { |
16 |
> [[ ${WAF_VERBOSE} == ON ]] && _mywafconfig="--verbose" |
17 |
> |
18 |
> local jobs="--jobs=$(makeopts_jobs)" |
19 |
> - echo "\"${WAF_BINARY}\" build ${_mywafconfig} ${jobs}" |
20 |
> - "${WAF_BINARY}" ${_mywafconfig} ${jobs} || die "build failed" |
21 |
> + echo "\"${WAF_BINARY}\" $@ build ${_mywafconfig} ${jobs}" |
22 |
> + "${WAF_BINARY}" $@ ${_mywafconfig} ${jobs} || die "build failed" |
23 |
|
24 |
"${@}" i.e. quote it or this is going to spew into a mess. |
25 |
|
26 |
> } |
27 |
> |
28 |
> # @FUNCTION: waf-utils_src_install |
29 |
> @@ -112,8 +112,8 @@ waf-utils_src_compile() { |
30 |
> waf-utils_src_install() { |
31 |
> debug-print-function ${FUNCNAME} "$@" |
32 |
> |
33 |
> - echo "\"${WAF_BINARY}\" --destdir=\"${D}\" install" |
34 |
> - "${WAF_BINARY}" --destdir="${D}" install || die "Make install failed" |
35 |
> + echo "\"${WAF_BINARY}\" --destdir=\"${D}\" \"$@\" install" |
36 |
> + "${WAF_BINARY}" --destdir="${D}" "$@" install || die "Make install failed" |
37 |
|
38 |
Likewise. |
39 |
|
40 |
> |
41 |
> # Manual document installation |
42 |
> einstalldocs |
43 |
|
44 |
-- |
45 |
Best regards, |
46 |
Michał Górny |