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 512A5138350 for ; Sat, 29 Feb 2020 20:48:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F0F64E0AD4; Sat, 29 Feb 2020 20:42:57 +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 825C5E0AD0 for ; Sat, 29 Feb 2020 20:42:57 +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 174D634F04C; Sat, 29 Feb 2020 20:42:55 +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 18/25] python-utils-r2.eclass: Remove PYTHON_CONFIG export Date: Sat, 29 Feb 2020 21:41:54 +0100 Message-Id: <20200229204201.99290-19-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: b3a8a7db-9a89-456f-bb59-93785f2f9a4f X-Archives-Hash: bb328cc4a431a73b044987ebf03cebfd Signed-off-by: Michał Górny --- eclass/python-utils-r2.eclass | 41 +++++++++++++++------------------ eclass/tests/python-utils-r2.sh | 6 ++--- 2 files changed, 21 insertions(+), 26 deletions(-) diff --git a/eclass/python-utils-r2.eclass b/eclass/python-utils-r2.eclass index 00bc635ebab4..7c438e59aa6a 100644 --- a/eclass/python-utils-r2.eclass +++ b/eclass/python-utils-r2.eclass @@ -268,23 +268,6 @@ _python_export() { export PYTHON=${EPREFIX}/usr/bin/${impl} debug-print "${FUNCNAME}: PYTHON = ${PYTHON}" ;; - PYTHON_CONFIG) - local flags val - - case "${impl}" in - python*) - [[ -n ${PYTHON} ]] || die "PYTHON needs to be set for ${var} to be exported, or requested before it" - flags=$("${PYTHON}" -c 'import sysconfig; print(sysconfig.get_config_var("ABIFLAGS") or "")') || die - val=${PYTHON}${flags}-config - ;; - *) - die "${impl}: obtaining ${var} not supported" - ;; - esac - - export PYTHON_CONFIG=${val} - debug-print "${FUNCNAME}: PYTHON_CONFIG = ${PYTHON_CONFIG}" - ;; PYTHON_PKG_DEP) local d case ${impl} in @@ -431,20 +414,32 @@ python_get_LIBS() { } # @FUNCTION: python_get_PYTHON_CONFIG -# @USAGE: [] # @DESCRIPTION: -# Obtain and print the PYTHON_CONFIG location for the given -# implementation. If no implementation is provided, ${EPYTHON} will be -# used. +# Obtain and print the PYTHON_CONFIG location for ${EPYTHON}. # # Please note that this function can be used with CPython only. # It requires Python installed, and therefore proper build-time # dependencies need be added to the ebuild. python_get_PYTHON_CONFIG() { debug-print-function ${FUNCNAME} "${@}" + [[ ${EPYTHON} ]] || die "EPYTHON must be set before calling ${FUNCNAME}" + + local flags out + local PYTHON + _python_export PYTHON - _python_export "${@}" PYTHON_CONFIG - echo "${PYTHON_CONFIG}" + case ${EPYTHON} in + python*) + flags=$("${EPYTHON}" -c 'import sysconfig; print(sysconfig.get_config_var("ABIFLAGS") or "")') || die + out=${PYTHON}${flags}-config + ;; + *) + die "${EPYTHON}: obtaining PYTHON_CONFIG not supported" + ;; + esac + + debug-print "${FUNCNAME} -> ${out}" + echo "${out}" } # @FUNCTION: python_get_scriptdir diff --git a/eclass/tests/python-utils-r2.sh b/eclass/tests/python-utils-r2.sh index 8758f6d20464..0b41a7bcdb53 100755 --- a/eclass/tests/python-utils-r2.sh +++ b/eclass/tests/python-utils-r2.sh @@ -79,7 +79,7 @@ if [[ -x /usr/bin/python2.7 ]]; then test_get sitedir python2.7 "/usr/lib*/python2.7/site-packages" test_get includedir python2.7 /usr/include/python2.7 test_get library_path python2.7 "/usr/lib*/libpython2.7$(get_libname)" - test_var PYTHON_CONFIG python2_7 /usr/bin/python2.7-config + test_get PYTHON_CONFIG python2.7 /usr/bin/python2.7-config test_get CFLAGS python2.7 "*-I/usr/include/python2.7*" test_get LIBS python2.7 "*-lpython2.7*" fi @@ -93,7 +93,7 @@ if [[ -x /usr/bin/python3.6 ]]; then test_get sitedir python3.6 "/usr/lib*/python3.6/site-packages" test_get includedir python3.6 "/usr/include/python3.6${abiflags}" test_get library_path python3.6 "/usr/lib*/libpython3.6${abiflags}$(get_libname)" - test_var PYTHON_CONFIG python3_6 "/usr/bin/python3.6${abiflags}-config" + test_get PYTHON_CONFIG python3.6 "/usr/bin/python3.6${abiflags}-config" test_get CFLAGS python3.6 "*-I/usr/include/python3.6*" test_get LIBS python3.6 "*-lpython3.6*" fi @@ -107,7 +107,7 @@ if [[ -x /usr/bin/python3.7 ]]; then test_get sitedir python3.7 "/usr/lib/python3.7/site-packages" test_get includedir python3.7 "/usr/include/python3.7${abiflags}" test_get library_path python3.7 "/usr/lib*/libpython3.7${abiflags}$(get_libname)" - test_var PYTHON_CONFIG python3_7 "/usr/bin/python3.7${abiflags}-config" + test_get PYTHON_CONFIG python3.7 "/usr/bin/python3.7${abiflags}-config" test_get CFLAGS python3.7 "*-I/usr/include/python3.7*" test_get LIBS python3.7 "*-lpython3.7*" fi -- 2.25.1