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 500D61382C5 for ; Mon, 25 May 2020 06:12:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EA3F1E089E; Mon, 25 May 2020 06:12:40 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 D1833E089E for ; Mon, 25 May 2020 06:12:40 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 41E8134EFCD for ; Mon, 25 May 2020 06:12:39 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2B75F264 for ; Mon, 25 May 2020 06:12:37 +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: <1590386838.e563ed3af0dad1d3eaa165f5eb89b6f7ed0a1c9c.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/tests/, eclass/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/python-utils-r1.eclass eclass/tests/python-utils-r1.sh X-VCS-Directories: eclass/ eclass/tests/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: e563ed3af0dad1d3eaa165f5eb89b6f7ed0a1c9c X-VCS-Branch: master Date: Mon, 25 May 2020 06:12:37 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 9b79c71b-4f35-4fb5-8a92-e2cd54d1f2ed X-Archives-Hash: 77b5b6d72febe2b3ecbab6292fac9010 commit: e563ed3af0dad1d3eaa165f5eb89b6f7ed0a1c9c Author: Michał Górny gentoo org> AuthorDate: Mon May 25 06:04:34 2020 +0000 Commit: Michał Górny gentoo org> CommitDate: Mon May 25 06:07:18 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e563ed3a python-utils-r1.eclass: Enable python3_9 Signed-off-by: Michał Górny gentoo.org> eclass/python-utils-r1.eclass | 4 ++-- eclass/tests/python-utils-r1.sh | 16 +++++++++++++++- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass index 4af710da363..1067d2367ab 100644 --- a/eclass/python-utils-r1.eclass +++ b/eclass/python-utils-r1.eclass @@ -41,7 +41,7 @@ inherit toolchain-funcs _PYTHON_ALL_IMPLS=( pypy3 python2_7 - python3_6 python3_7 python3_8 + python3_6 python3_7 python3_8 python3_9 ) readonly _PYTHON_ALL_IMPLS @@ -77,7 +77,7 @@ _python_impl_supported() { # keep in sync with _PYTHON_ALL_IMPLS! # (not using that list because inline patterns shall be faster) case "${impl}" in - python2_7|python3_[678]|pypy3) + python2_7|python3_[6789]|pypy3) return 0 ;; jython2_7|pypy|pypy1_[89]|pypy2_0|python2_[56]|python3_[12345]) diff --git a/eclass/tests/python-utils-r1.sh b/eclass/tests/python-utils-r1.sh index 192c1183e80..86b87ec173d 100755 --- a/eclass/tests/python-utils-r1.sh +++ b/eclass/tests/python-utils-r1.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -115,6 +115,20 @@ fi test_var PYTHON_PKG_DEP python3_8 '*dev-lang/python*:3.8' test_var PYTHON_SCRIPTDIR python3_8 /usr/lib/python-exec/python3.8 +test_var EPYTHON python3_9 python3.9 +test_var PYTHON python3_9 /usr/bin/python3.9 +if [[ -x /usr/bin/python3.9 ]]; then + abiflags=$(/usr/bin/python3.9 -c 'import sysconfig; print(sysconfig.get_config_var("ABIFLAGS"))') + test_var PYTHON_SITEDIR python3_9 "/usr/lib/python3.9/site-packages" + test_var PYTHON_INCLUDEDIR python3_9 "/usr/include/python3.9${abiflags}" + test_var PYTHON_LIBPATH python3_9 "/usr/lib*/libpython3.9${abiflags}$(get_libname)" + test_var PYTHON_CONFIG python3_9 "/usr/bin/python3.9${abiflags}-config" + test_var PYTHON_CFLAGS python3_9 "*-I/usr/include/python3.9*" + test_var PYTHON_LIBS python3_9 "*-lpython3.9*" +fi +test_var PYTHON_PKG_DEP python3_9 '*dev-lang/python*:3.9' +test_var PYTHON_SCRIPTDIR python3_9 /usr/lib/python-exec/python3.9 + test_var EPYTHON pypy3 pypy3 test_var PYTHON pypy3 /usr/bin/pypy3 if [[ -x /usr/bin/pypy3 ]]; then