From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E5F92138350 for ; Sat, 29 Feb 2020 20:45:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0F67AE09E4; Sat, 29 Feb 2020 20:42:42 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A170DE09DE for ; Sat, 29 Feb 2020 20:42:41 +0000 (UTC) Received: from localhost.localdomain (c142-245.icpnet.pl [85.221.142.245]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: mgorny) by smtp.gentoo.org (Postfix) with ESMTPSA id 108DC34F0DC; Sat, 29 Feb 2020 20:42:39 +0000 (UTC) From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= To: gentoo-dev@lists.gentoo.org Cc: python@gentoo.org, =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Subject: [gentoo-dev] [PATCH 08/25] python-utils-r2.eclass: Mark python_wrapper_setup private Date: Sat, 29 Feb 2020 21:41:44 +0100 Message-Id: <20200229204201.99290-9-mgorny@gentoo.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200229204201.99290-1-mgorny@gentoo.org> References: <20200229204201.99290-1-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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Archives-Salt: 2bae7985-a154-4875-a1e1-dcb66e8caeae X-Archives-Hash: 8c76d52012caac730fee4665b7d49b4f Signed-off-by: Michał Górny --- eclass/python-any-r2.eclass | 8 ++++---- eclass/python-r2.eclass | 4 ++-- eclass/python-single-r2.eclass | 4 ++-- eclass/python-utils-r2.eclass | 5 +++-- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/eclass/python-any-r2.eclass b/eclass/python-any-r2.eclass index cf70f23f69d5..05e614ca4899 100644 --- a/eclass/python-any-r2.eclass +++ b/eclass/python-any-r2.eclass @@ -296,7 +296,7 @@ python_setup() { ewarn "Dependencies won't be satisfied, and EPYTHON/eselect-python will be ignored." python_export "${impls[0]}" EPYTHON PYTHON - python_wrapper_setup + _python_wrapper_setup return fi @@ -304,7 +304,7 @@ python_setup() { if [[ ${EPYTHON} ]]; then if _python_EPYTHON_supported "${EPYTHON}"; then python_export EPYTHON PYTHON - python_wrapper_setup + _python_wrapper_setup return fi fi @@ -319,7 +319,7 @@ python_setup() { break elif _python_EPYTHON_supported "${i}"; then python_export "${i}" EPYTHON PYTHON - python_wrapper_setup + _python_wrapper_setup return fi done @@ -329,7 +329,7 @@ python_setup() { for (( i = ${#_PYTHON_SUPPORTED_IMPLS[@]} - 1; i >= 0; i-- )); do python_export "${_PYTHON_SUPPORTED_IMPLS[i]}" EPYTHON PYTHON if _python_EPYTHON_supported "${EPYTHON}"; then - python_wrapper_setup + _python_wrapper_setup return fi done diff --git a/eclass/python-r2.eclass b/eclass/python-r2.eclass index 1ebc424bc9b3..feb8229eb2c5 100644 --- a/eclass/python-r2.eclass +++ b/eclass/python-r2.eclass @@ -593,7 +593,7 @@ _python_multibuild_wrapper() { local -x EPYTHON PYTHON local -x PATH=${PATH} PKG_CONFIG_PATH=${PKG_CONFIG_PATH} python_export "${MULTIBUILD_VARIANT}" EPYTHON PYTHON - python_wrapper_setup + _python_wrapper_setup "${@}" } @@ -739,7 +739,7 @@ python_setup() { die "${FUNCNAME}: no enabled implementation satisfy requirements" fi - python_wrapper_setup + _python_wrapper_setup } # @FUNCTION: python_replicate_script diff --git a/eclass/python-single-r2.eclass b/eclass/python-single-r2.eclass index 5bf6ea7221bc..fdb3438f0531 100644 --- a/eclass/python-single-r2.eclass +++ b/eclass/python-single-r2.eclass @@ -462,7 +462,7 @@ python_setup() { ewarn "Dependencies won't be satisfied, and PYTHON_SINGLE_TARGET flags will be ignored." python_export "${impls[0]}" EPYTHON PYTHON - python_wrapper_setup + _python_wrapper_setup return fi @@ -479,7 +479,7 @@ python_setup() { fi python_export "${impl}" EPYTHON PYTHON - python_wrapper_setup + _python_wrapper_setup fi done diff --git a/eclass/python-utils-r2.eclass b/eclass/python-utils-r2.eclass index 1f904d035050..f0d8f366c050 100644 --- a/eclass/python-utils-r2.eclass +++ b/eclass/python-utils-r2.eclass @@ -943,8 +943,9 @@ python_doheader() { ) } -# @FUNCTION: python_wrapper_setup +# @FUNCTION: _python_wrapper_setup # @USAGE: [ []] +# @INTERNAL # @DESCRIPTION: # Create proper 'python' executable and pkg-config wrappers # (if available) in the directory named by . Set up PATH @@ -957,7 +958,7 @@ python_doheader() { # be assumed to contain proper wrappers already and only environment # setup will be done. If wrapper update is requested, the directory # shall be removed first. -python_wrapper_setup() { +_python_wrapper_setup() { debug-print-function ${FUNCNAME} "${@}" local workdir=${1:-${T}/${EPYTHON}} -- 2.25.1