[gentoo-dev] [PATCH] eclass/waf-utils.eclass: add parameters to compile and install

[gentoo-dev] [PATCH] eclass/waf-utils.eclass: add parameters to compile and install

[Victor Kustov]

[1] https://github.com/gentoo/gentoo/pull/9533#discussion_r211739558

This patch add parameters to compile and install phases in waf-utils
eclass. Need to solve [1]

---
 eclass/waf-utils.eclass | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/eclass/waf-utils.eclass b/eclass/waf-utils.eclass
index 4d02483a927..33515b883b5 100644
--- a/eclass/waf-utils.eclass
+++ b/eclass/waf-utils.eclass
@@ -102,8 +102,8 @@ waf-utils_src_compile() {
 	[[ ${WAF_VERBOSE} == ON ]] && _mywafconfig="--verbose"
 
 	local jobs="--jobs=$(makeopts_jobs)"
-	echo "\"${WAF_BINARY}\" build ${_mywafconfig} ${jobs}"
-	"${WAF_BINARY}" ${_mywafconfig} ${jobs} || die "build failed"
+	echo "\"${WAF_BINARY}\" $@ build ${_mywafconfig} ${jobs}"
+	"${WAF_BINARY}" $@ ${_mywafconfig} ${jobs} || die "build failed"
 }
 
 # @FUNCTION: waf-utils_src_install
@@ -112,8 +112,8 @@ waf-utils_src_compile() {
 waf-utils_src_install() {
 	debug-print-function ${FUNCNAME} "$@"
 
-	echo "\"${WAF_BINARY}\" --destdir=\"${D}\" install"
-	"${WAF_BINARY}" --destdir="${D}" install  || die "Make install failed"
+	echo "\"${WAF_BINARY}\" --destdir=\"${D}\" \"$@\" install"
+	"${WAF_BINARY}" --destdir="${D}" "$@" install  || die "Make install failed"
 
 	# Manual document installation
 	einstalldocs
-- 
2.16.4

Re: [gentoo-dev] [PATCH] eclass/waf-utils.eclass: add parameters to compile and install

[Michał Górny]

[-- Attachment #1: Type: text/plain, Size: 1562 bytes --]

On Fri, 2018-09-21 at 18:51 +0300, Victor Kustov wrote:
> [1] https://github.com/gentoo/gentoo/pull/9533#discussion_r211739558
> 
> This patch add parameters to compile and install phases in waf-utils
> eclass. Need to solve [1]
> 
> ---
>  eclass/waf-utils.eclass | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/eclass/waf-utils.eclass b/eclass/waf-utils.eclass
> index 4d02483a927..33515b883b5 100644
> --- a/eclass/waf-utils.eclass
> +++ b/eclass/waf-utils.eclass
> @@ -102,8 +102,8 @@ waf-utils_src_compile() {
>  	[[ ${WAF_VERBOSE} == ON ]] && _mywafconfig="--verbose"
>  
>  	local jobs="--jobs=$(makeopts_jobs)"
> -	echo "\"${WAF_BINARY}\" build ${_mywafconfig} ${jobs}"
> -	"${WAF_BINARY}" ${_mywafconfig} ${jobs} || die "build failed"
> +	echo "\"${WAF_BINARY}\" $@ build ${_mywafconfig} ${jobs}"
> +	"${WAF_BINARY}" $@ ${_mywafconfig} ${jobs} || die "build failed"

"${@}" i.e. quote it or this is going to spew into a mess.

>  }
>  
>  # @FUNCTION: waf-utils_src_install
> @@ -112,8 +112,8 @@ waf-utils_src_compile() {
>  waf-utils_src_install() {
>  	debug-print-function ${FUNCNAME} "$@"
>  
> -	echo "\"${WAF_BINARY}\" --destdir=\"${D}\" install"
> -	"${WAF_BINARY}" --destdir="${D}" install  || die "Make install failed"
> +	echo "\"${WAF_BINARY}\" --destdir=\"${D}\" \"$@\" install"
> +	"${WAF_BINARY}" --destdir="${D}" "$@" install  || die "Make install failed"

Likewise.

>  
>  	# Manual document installation
>  	einstalldocs

-- 
Best regards,
Michał Górny

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 963 bytes --]

Re: [gentoo-dev] [PATCH] eclass/waf-utils.eclass: add parameters to compile and install

[Victor K]

[-- Attachment #1.1: Type: text/plain, Size: 7 bytes --]

fixed

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: 0001-class-waf-utils.eclass-add-parameters-to-compile-and.patch --]
[-- Type: text/x-patch, Size: 1666 bytes --]

From 09f4d9d638c2079aa05043236703159971042a6e Mon Sep 17 00:00:00 2001
From: ktrace <ktrace@yandex.ru>
Date: Sat, 22 Sep 2018 15:53:16 +0300
Subject: [PATCH] class/waf-utils.eclass: add parameters to compile and 
 install

---
 eclass/waf-utils.eclass | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/eclass/waf-utils.eclass b/eclass/waf-utils.eclass
index 4d02483a927..e7c8acafd3e 100644
--- a/eclass/waf-utils.eclass
+++ b/eclass/waf-utils.eclass
@@ -89,7 +89,7 @@ waf-utils_src_configure() {
 	CCFLAGS="${CFLAGS}" LINKFLAGS="${CFLAGS} ${LDFLAGS}" "${WAF_BINARY}" \
 		"--prefix=${EPREFIX}/usr" \
 		"${libdir[@]}" \
-		"$@" \
+		"${@}" \
 		configure || die "configure failed"
 }
 
@@ -102,8 +102,8 @@ waf-utils_src_compile() {
 	[[ ${WAF_VERBOSE} == ON ]] && _mywafconfig="--verbose"
 
 	local jobs="--jobs=$(makeopts_jobs)"
-	echo "\"${WAF_BINARY}\" build ${_mywafconfig} ${jobs}"
-	"${WAF_BINARY}" ${_mywafconfig} ${jobs} || die "build failed"
+    echo "\"${WAF_BINARY}\" ${@} build ${_mywafconfig} ${jobs}"
+    "${WAF_BINARY}" "${@}" ${_mywafconfig} ${jobs} || die "build failed"
 }
 
 # @FUNCTION: waf-utils_src_install
@@ -112,9 +112,8 @@ waf-utils_src_compile() {
 waf-utils_src_install() {
 	debug-print-function ${FUNCNAME} "$@"
 
-	echo "\"${WAF_BINARY}\" --destdir=\"${D}\" install"
-	"${WAF_BINARY}" --destdir="${D}" install  || die "Make install failed"
-
+    echo "\"${WAF_BINARY}\" --destdir=\"${D}\" \"${@}\" install"
+    "${WAF_BINARY}" --destdir="${D}" "${@}" install  || die "Make install failed"
 	# Manual document installation
 	einstalldocs
 }
-- 
2.16.4


[-- Attachment #2: Цифровая подпись OpenPGP --]
[-- Type: application/pgp-signature, Size: 488 bytes --]