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 5E46E1384B4 for ; Sat, 7 Nov 2015 09:17:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1BE4621C046; Sat, 7 Nov 2015 09:16:53 +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 5B85A21C046 for ; Sat, 7 Nov 2015 09:16:51 +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 A790B340775 for ; Sat, 7 Nov 2015 09:16:50 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DF7C41BB for ; Sat, 7 Nov 2015 09:16:45 +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: <1446887543.b52e01678e9106467a712258e0f3a6a3af53bb62.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:python-soabi-cleanup commit in: eclass/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/python-utils-r1.eclass X-VCS-Directories: eclass/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: b52e01678e9106467a712258e0f3a6a3af53bb62 X-VCS-Branch: python-soabi-cleanup Date: Sat, 7 Nov 2015 09:16:45 +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: dfb6555d-5df4-4c45-8f2f-dc8864938bf3 X-Archives-Hash: 723116e9e64a812dc0317cc8d0f5930a commit: b52e01678e9106467a712258e0f3a6a3af53bb62 Author: Michał Górny gentoo org> AuthorDate: Fri Nov 6 22:41:52 2015 +0000 Commit: Michał Górny gentoo org> CommitDate: Sat Nov 7 09:12:23 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b52e0167 python-utils-r1.eclass: Obtain library path from the interpreter Obtain library path as concatenation of LIBDIR and LDLIBRARY config variables (from sysconfig module) rather than hardcoding it in the eclass. This improves maintainability and fixes compatibility with ABIFLAGS-enabled Python 3.3+. eclass/python-utils-r1.eclass | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass index 911a1fd..016d3a7 100644 --- a/eclass/python-utils-r1.eclass +++ b/eclass/python-utils-r1.eclass @@ -151,7 +151,8 @@ _python_impl_supported() { # The path to Python library. # # Set and exported on request using python_export(). -# Valid only for CPython. +# Valid only for CPython. Requires a proper build-time dependency +# on the Python implementation. # # Example value: # @CODE @@ -283,20 +284,12 @@ python_export() { fi ;; PYTHON_LIBPATH) - local libname - case "${impl}" in - python*) - libname=lib${impl} - ;; - *) - die "${impl} lacks a dynamic library" - ;; - esac - - local path=${EPREFIX}/usr/$(get_libdir) - - export PYTHON_LIBPATH=${path}/${libname}$(get_libname) + export PYTHON_LIBPATH=$("${PYTHON}" -c 'import os.path, sysconfig; print(os.path.join(sysconfig.get_config_var("LIBDIR"), sysconfig.get_config_var("LDLIBRARY")) if sysconfig.get_config_var("LDLIBRARY") else "")') debug-print "${FUNCNAME}: PYTHON_LIBPATH = ${PYTHON_LIBPATH}" + + if [[ ! ${PYTHON_LIBPATH} ]]; then + die "${impl} lacks a (usable) dynamic library" + fi ;; PYTHON_CFLAGS) local val