From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 0AA931384B4 for ; Fri, 1 Jan 2016 16:44:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AFCA421C096; Fri, 1 Jan 2016 16:41:45 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E928F21C092 for ; Fri, 1 Jan 2016 16:41:44 +0000 (UTC) Received: from localhost.localdomain (d202-251.icpnet.pl [109.173.202.251]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: mgorny) by smtp.gentoo.org (Postfix) with ESMTPSA id 50E9B340A38; Fri, 1 Jan 2016 16:41:42 +0000 (UTC) From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= To: gentoo-dev@lists.gentoo.org Cc: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Subject: [gentoo-dev] [PATCH 07/15] scons-utils.eclass: Deprecate myesconsargs, and kill it in EAPI 6 Date: Fri, 1 Jan 2016 17:41:13 +0100 Message-Id: <1451666481-22145-8-git-send-email-mgorny@gentoo.org> X-Mailer: git-send-email 2.6.4 In-Reply-To: <1451666481-22145-1-git-send-email-mgorny@gentoo.org> References: <1451666481-22145-1-git-send-email-mgorny@gentoo.org> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-dev@lists.gentoo.org Reply-to: gentoo-dev@lists.gentoo.org X-Archives-Salt: 003535a1-138f-42bd-9c57-0fb0aad39903 X-Archives-Hash: 20dc178b2bb17bea0fa71b645ea036c7 --- eclass/scons-utils.eclass | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/eclass/scons-utils.eclass b/eclass/scons-utils.eclass index fe9160a0..fdc6af3 100644 --- a/eclass/scons-utils.eclass +++ b/eclass/scons-utils.eclass @@ -58,6 +58,8 @@ # @VARIABLE: myesconsargs # @DEFAULT_UNSET # @DESCRIPTION: +# DEPRECATED, EAPI 0..5 ONLY: pass options to escons instead +# # List of package-specific options to pass to all SCons calls. Supposed to be # set in src_configure(). @@ -103,20 +105,23 @@ fi # -- public functions -- # @FUNCTION: escons -# @USAGE: [scons-arg] ... +# @USAGE: [...] # @DESCRIPTION: -# Call scons, passing the supplied arguments, ${myesconsargs[@]}, -# filtered ${MAKEOPTS}, ${EXTRA_ESCONS}. Similar to emake. Like emake, -# this function does die on failure in EAPI 4. Respects nonfatal -# in EAPI 6 and newer. +# Call scons, passing the supplied arguments. Like emake, this function +# does die on failure in EAPI 4. Respects nonfatal in EAPI 6 and newer. escons() { local ret debug-print-function ${FUNCNAME} "${@}" + # Use myesconsargs in EAPI 5 and older + if [[ ${EAPI} == [012345] ]]; then + set -- "${myesconsargs[@]}" "${@}" + fi + # if SCONSOPTS are _unset_, use cleaned MAKEOPTS set -- scons ${SCONSOPTS-$(scons_clean_makeopts)} ${EXTRA_ESCONS} \ - "${myesconsargs[@]}" "${@}" + "${@}" echo "${@}" >&2 "${@}" ret=${?} -- 2.6.4