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 DD3A01388BF for ; Fri, 8 Jan 2016 05:15:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5BED3E0896; Fri, 8 Jan 2016 05:15:02 +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 5C85AE0883 for ; Fri, 8 Jan 2016 05:15:01 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 94A18340A5C for ; Fri, 8 Jan 2016 05:15:00 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 03E4CD22 for ; Fri, 8 Jan 2016 05:14:56 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1452230076.a4de8aa2e9ef28100fb8834aaeb4495f66efb8d9.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/tests/, eclass/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/scons-utils.eclass eclass/tests/scons-utils.sh X-VCS-Directories: eclass/ eclass/tests/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: a4de8aa2e9ef28100fb8834aaeb4495f66efb8d9 X-VCS-Branch: master Date: Fri, 8 Jan 2016 05:14:56 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 54897ad7-8941-4eac-85f2-a64e6bef9b39 X-Archives-Hash: 1193b7742ecddf50881b36e8b5ac0b91 commit: a4de8aa2e9ef28100fb8834aaeb4495f66efb8d9 Author: Michał Górny gentoo org> AuthorDate: Fri Jan 1 12:52:26 2016 +0000 Commit: Michał Górny gentoo org> CommitDate: Fri Jan 8 05:14:36 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4de8aa2 scons-utils.eclass: scons_clean_makeopts, mark internal eclass/scons-utils.eclass | 7 ++++--- eclass/tests/scons-utils.sh | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/eclass/scons-utils.eclass b/eclass/scons-utils.eclass index b8051b0..e5e309b 100644 --- a/eclass/scons-utils.eclass +++ b/eclass/scons-utils.eclass @@ -124,7 +124,7 @@ escons() { fi # if SCONSOPTS are _unset_, use cleaned MAKEOPTS - set -- scons ${SCONSOPTS-$(scons_clean_makeopts)} ${EXTRA_ESCONS} \ + set -- scons ${SCONSOPTS-$(_scons_clean_makeopts)} ${EXTRA_ESCONS} \ "${@}" echo "${@}" >&2 "${@}" @@ -145,14 +145,15 @@ escons() { return ${ret} } -# @FUNCTION: scons_clean_makeopts +# @FUNCTION: _scons_clean_makeopts +# @INTERNAL # @USAGE: [makeflags] [...] # @DESCRIPTION: # Strip the supplied makeflags (or ${MAKEOPTS} if called without # an argument) of options not supported by SCons and make sure --jobs # gets an argument. Output the resulting flag list (suitable # for an assignment to SCONSOPTS). -scons_clean_makeopts() { +_scons_clean_makeopts() { local new_makeopts debug-print-function ${FUNCNAME} "${@}" diff --git a/eclass/tests/scons-utils.sh b/eclass/tests/scons-utils.sh index 7387135..df8af7a 100755 --- a/eclass/tests/scons-utils.sh +++ b/eclass/tests/scons-utils.sh @@ -10,7 +10,7 @@ inherit scons-utils test-scons_clean_makeopts() { tbegin "scons_clean_makeopts() for ${1}" - local sconsopts=$(scons_clean_makeopts ${1}) ret=0 + local sconsopts=$(_scons_clean_makeopts ${1}) ret=0 if [[ ${sconsopts} != ${2-${1}} ]]; then eerror "Self-test failed:"