1 |
--- |
2 |
eclass/python-utils-r1.eclass | 15 +++++++++------ |
3 |
1 file changed, 9 insertions(+), 6 deletions(-) |
4 |
|
5 |
diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass |
6 |
index 6fb1ec5..ce6f2d1 100644 |
7 |
--- a/eclass/python-utils-r1.eclass |
8 |
+++ b/eclass/python-utils-r1.eclass |
9 |
@@ -281,12 +281,14 @@ python_export() { |
10 |
# sysconfig can't be used because: |
11 |
# 1) pypy doesn't give site-packages but stdlib |
12 |
# 2) jython gives paths with wrong case |
13 |
- export PYTHON_SITEDIR=$("${PYTHON}" -c 'import distutils.sysconfig; print(distutils.sysconfig.get_python_lib())' || die) |
14 |
+ PYTHON_SITEDIR=$("${PYTHON}" -c 'import distutils.sysconfig; print(distutils.sysconfig.get_python_lib())') || die |
15 |
+ export PYTHON_SITEDIR |
16 |
debug-print "${FUNCNAME}: PYTHON_SITEDIR = ${PYTHON_SITEDIR}" |
17 |
;; |
18 |
PYTHON_INCLUDEDIR) |
19 |
[[ -n ${PYTHON} ]] || die "PYTHON needs to be set for ${var} to be exported, or requested before it" |
20 |
- export PYTHON_INCLUDEDIR=$("${PYTHON}" -c 'import distutils.sysconfig; print(distutils.sysconfig.get_python_inc())' || die) |
21 |
+ PYTHON_INCLUDEDIR=$("${PYTHON}" -c 'import distutils.sysconfig; print(distutils.sysconfig.get_python_inc())') || die |
22 |
+ export PYTHON_INCLUDEDIR |
23 |
debug-print "${FUNCNAME}: PYTHON_INCLUDEDIR = ${PYTHON_INCLUDEDIR}" |
24 |
|
25 |
# Jython gives a non-existing directory |
26 |
@@ -296,7 +298,8 @@ python_export() { |
27 |
;; |
28 |
PYTHON_LIBPATH) |
29 |
[[ -n ${PYTHON} ]] || die "PYTHON needs to be set for ${var} to be exported, or requested before it" |
30 |
- 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) |
31 |
+ 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 |
32 |
+ export PYTHON_LIBPATH |
33 |
debug-print "${FUNCNAME}: PYTHON_LIBPATH = ${PYTHON_LIBPATH}" |
34 |
|
35 |
if [[ ! ${PYTHON_LIBPATH} ]]; then |
36 |
@@ -309,7 +312,7 @@ python_export() { |
37 |
case "${impl}" in |
38 |
python*) |
39 |
# python-2.7, python-3.2, etc. |
40 |
- val=$($(tc-getPKG_CONFIG) --cflags ${impl/n/n-} || die) |
41 |
+ val=$($(tc-getPKG_CONFIG) --cflags ${impl/n/n-}) || die |
42 |
;; |
43 |
*) |
44 |
die "${impl}: obtaining ${var} not supported" |
45 |
@@ -325,7 +328,7 @@ python_export() { |
46 |
case "${impl}" in |
47 |
python*) |
48 |
# python-2.7, python-3.2, etc. |
49 |
- val=$($(tc-getPKG_CONFIG) --libs ${impl/n/n-} || die) |
50 |
+ val=$($(tc-getPKG_CONFIG) --libs ${impl/n/n-}) || die |
51 |
;; |
52 |
*) |
53 |
die "${impl}: obtaining ${var} not supported" |
54 |
@@ -341,7 +344,7 @@ python_export() { |
55 |
case "${impl}" in |
56 |
python*) |
57 |
[[ -n ${PYTHON} ]] || die "PYTHON needs to be set for ${var} to be exported, or requested before it" |
58 |
- flags=$("${PYTHON}" -c 'import sysconfig; print(sysconfig.get_config_var("ABIFLAGS") or "")' || die) |
59 |
+ flags=$("${PYTHON}" -c 'import sysconfig; print(sysconfig.get_config_var("ABIFLAGS") or "")') || die |
60 |
val=${PYTHON}${flags}-config |
61 |
;; |
62 |
*) |
63 |
-- |
64 |
2.6.3 |