commit: beaa363972897c278c93830a620ddb20521cc5b9
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 19 15:25:49 2015 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Nov 22 09:00:12 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=beaa3639
python-utils-r1.eclass: Move ||die out of command substitution subshells
eclass/python-utils-r1.eclass | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
index 815dbae..6eeba31 100644
--- a/eclass/python-utils-r1.eclass
+++ b/eclass/python-utils-r1.eclass
@@ -281,12 +281,14 @@ python_export() {
# 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())' || die)
+ PYTHON_SITEDIR=$("${PYTHON}" -c 'import
distutils.sysconfig; print(distutils.sysconfig.get_python_lib())') || die
+ export PYTHON_SITEDIR
debug-print "${FUNCNAME}: PYTHON_SITEDIR =
${PYTHON_SITEDIR}"
;;
PYTHON_INCLUDEDIR)
[[ -n ${PYTHON} ]] || die "PYTHON needs to be
set for ${var} to be exported, or requested before it"
- export PYTHON_INCLUDEDIR=$("${PYTHON}" -c
'import distutils.sysconfig; print(distutils.sysconfig.get_python_inc())' ||
die)
+ PYTHON_INCLUDEDIR=$("${PYTHON}" -c 'import
distutils.sysconfig; print(distutils.sysconfig.get_python_inc())') || die
+ export PYTHON_INCLUDEDIR
debug-print "${FUNCNAME}: PYTHON_INCLUDEDIR =
${PYTHON_INCLUDEDIR}"
# Jython gives a non-existing directory
@@ -296,7 +298,8 @@ python_export() {
;;
PYTHON_LIBPATH)
[[ -n ${PYTHON} ]] || die "PYTHON needs to be
set for ${var} to be exported, or requested before it"
- 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 "")' || die)
+ 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 "")') || die
+ export PYTHON_LIBPATH
debug-print "${FUNCNAME}: PYTHON_LIBPATH =
${PYTHON_LIBPATH}"
if [[ ! ${PYTHON_LIBPATH} ]]; then
@@ -309,7 +312,7 @@ python_export() {
case "${impl}" in
python*)
# python-2.7, python-3.2, etc.
- val=$($(tc-getPKG_CONFIG)
--cflags ${impl/n/n-} || die)
+ val=$($(tc-getPKG_CONFIG)
--cflags ${impl/n/n-}) || die
;;
*)
die "${impl}: obtaining ${var}
not supported"
@@ -325,7 +328,7 @@ python_export() {
case "${impl}" in
python*)
# python-2.7, python-3.2, etc.
- val=$($(tc-getPKG_CONFIG)
--libs ${impl/n/n-} || die)
+ val=$($(tc-getPKG_CONFIG)
--libs ${impl/n/n-}) || die
;;
*)
die "${impl}: obtaining ${var}
not supported"
@@ -341,7 +344,7 @@ python_export() {
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)
+ flags=$("${PYTHON}" -c 'import
sysconfig; print(sysconfig.get_config_var("ABIFLAGS") or "")') || die
val=${PYTHON}${flags}-config
;;
*)
