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 960AD1384B4 for ; Wed, 11 Nov 2015 10:27:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0D43821C040; Wed, 11 Nov 2015 10:27:47 +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 3A1CF21C035 for ; Wed, 11 Nov 2015 10:27:46 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 405233405D5 for ; Wed, 11 Nov 2015 10:27:45 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2F3CF23F1 for ; Wed, 11 Nov 2015 10:27:42 +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: <1447237285.fd4001e9682ed11db9f6b2cf87f3e89ed291fe02.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/, eclass/tests/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/python-utils-r1.eclass eclass/tests/python-utils-r1.sh X-VCS-Directories: eclass/tests/ eclass/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: fd4001e9682ed11db9f6b2cf87f3e89ed291fe02 X-VCS-Branch: master Date: Wed, 11 Nov 2015 10:27:42 +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: f21fcb5c-0222-436d-b37b-67c0e5023449 X-Archives-Hash: 142a7ac0277b3bc282411b9285a699b8 commit: fd4001e9682ed11db9f6b2cf87f3e89ed291fe02 Author: Michał Górny gentoo org> AuthorDate: Sat Nov 7 19:30:24 2015 +0000 Commit: Michał Górny gentoo org> CommitDate: Wed Nov 11 10:21:25 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd4001e9 python-utils-r1.eclass: Obtain PYTHON_SITEDIR from the interpreter Obtain the Python site-packages directory path using the distutils.sysconfig module, rather than hardcoding it. eclass/python-utils-r1.eclass | 16 +++++----------- eclass/tests/python-utils-r1.sh | 12 +++++++----- 2 files changed, 12 insertions(+), 16 deletions(-) diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass index ec85d8a..e8de6b9 100644 --- a/eclass/python-utils-r1.eclass +++ b/eclass/python-utils-r1.eclass @@ -126,6 +126,7 @@ _python_impl_supported() { # The path to Python site-packages directory. # # Set and exported on request using python_export(). +# Requires a proper build-time dependency on the Python implementation. # # Example value: # @CODE @@ -267,17 +268,10 @@ python_export() { debug-print "${FUNCNAME}: PYTHON = ${PYTHON}" ;; PYTHON_SITEDIR) - local dir - case "${impl}" in - python*|pypy|pypy3) - dir=/usr/$(get_libdir)/${impl} - ;; - jython*) - dir=/usr/share/${impl/n/n-}/Lib - ;; - esac - - export PYTHON_SITEDIR=${EPREFIX}${dir}/site-packages + # sysconfig can't be used because: + # 1) pypy doesn't give site-packages but stdlib + # 2) jython gives paths with wrong case + export PYTHON_SITEDIR=$("${PYTHON}" -c 'import distutils.sysconfig; print(distutils.sysconfig.get_python_lib())') debug-print "${FUNCNAME}: PYTHON_SITEDIR = ${PYTHON_SITEDIR}" ;; PYTHON_INCLUDEDIR) diff --git a/eclass/tests/python-utils-r1.sh b/eclass/tests/python-utils-r1.sh index e54550d..457756d 100755 --- a/eclass/tests/python-utils-r1.sh +++ b/eclass/tests/python-utils-r1.sh @@ -63,8 +63,8 @@ inherit python-utils-r1 test_var EPYTHON python2_7 python2.7 test_var PYTHON python2_7 /usr/bin/python2.7 -test_var PYTHON_SITEDIR python2_7 /usr/lib/python2.7/site-packages if [[ -x /usr/bin/python2.7 ]]; then + test_var PYTHON_SITEDIR python2_7 "/usr/lib*/python2.7/site-packages" test_var PYTHON_INCLUDEDIR python2_7 /usr/include/python2.7 test_var PYTHON_LIBPATH python2_7 "/usr/lib*/libpython2.7$(get_libname)" fi @@ -73,9 +73,9 @@ test_var PYTHON_SCRIPTDIR python2_7 /usr/lib/python-exec/python2.7 test_var EPYTHON python3_4 python3.4 test_var PYTHON python3_4 /usr/bin/python3.4 -test_var PYTHON_SITEDIR python3_4 /usr/lib/python3.4/site-packages if [[ -x /usr/bin/python3.4 ]]; then abiflags=$(/usr/bin/python3.4 -c 'import sysconfig; print(sysconfig.get_config_var("ABIFLAGS"))') + test_var PYTHON_SITEDIR python3_4 "/usr/lib*/python3.4/site-packages" test_var PYTHON_INCLUDEDIR python3_4 "/usr/include/python3.4${abiflags}" test_var PYTHON_LIBPATH python3_4 "/usr/lib*/libpython3.4${abiflags}$(get_libname)" fi @@ -84,14 +84,16 @@ test_var PYTHON_SCRIPTDIR python3_4 /usr/lib/python-exec/python3.4 test_var EPYTHON jython2_7 jython2.7 test_var PYTHON jython2_7 /usr/bin/jython2.7 -test_var PYTHON_SITEDIR jython2_7 /usr/share/jython-2.7/Lib/site-packages +if [[ -x /usr/bin/jython2.7 ]]; then + test_var PYTHON_SITEDIR jython2_7 /usr/share/jython-2.7/Lib/site-packages +fi test_var PYTHON_PKG_DEP jython2_7 '*dev-java/jython*:2.7' test_var PYTHON_SCRIPTDIR jython2_7 /usr/lib/python-exec/jython2.7 test_var EPYTHON pypy pypy test_var PYTHON pypy /usr/bin/pypy -test_var PYTHON_SITEDIR pypy /usr/lib/pypy/site-packages if [[ -x /usr/bin/pypy ]]; then + test_var PYTHON_SITEDIR pypy "/usr/lib*/pypy/site-packages" test_var PYTHON_INCLUDEDIR pypy "/usr/lib*/pypy/include" fi test_var PYTHON_PKG_DEP pypy '*virtual/pypy*:0=' @@ -99,8 +101,8 @@ test_var PYTHON_SCRIPTDIR pypy /usr/lib/python-exec/pypy test_var EPYTHON pypy3 pypy3 test_var PYTHON pypy3 /usr/bin/pypy3 -test_var PYTHON_SITEDIR pypy3 /usr/lib/pypy3/site-packages if [[ -x /usr/bin/pypy3 ]]; then + test_var PYTHON_SITEDIR pypy3 "/usr/lib*/pypy3/site-packages" test_var PYTHON_INCLUDEDIR pypy3 /usr/lib/pypy3/include fi test_var PYTHON_PKG_DEP pypy3 '*virtual/pypy3*:0='