1 |
dev-lang/python sometimes used to install the epython module into the |
2 |
wrong libdir (e.g. lib vs lib64). The earlier eclass changes actually |
3 |
break the build entirely as sysconfigdata is now sourced from within |
4 |
SYSROOT, where it may not even be installed yet. This therefore needs |
5 |
to be handled as a special case where sysconfigdata is sourced from |
6 |
within ED instead. |
7 |
|
8 |
Signed-off-by: James Le Cuirot <chewi@g.o> |
9 |
--- |
10 |
eclass/python-utils-r1.eclass | 6 +++++- |
11 |
1 file changed, 5 insertions(+), 1 deletion(-) |
12 |
|
13 |
diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass |
14 |
index 91e457f3cf14..17de9ca9c44f 100644 |
15 |
--- a/eclass/python-utils-r1.eclass |
16 |
+++ b/eclass/python-utils-r1.eclass |
17 |
@@ -1028,7 +1028,11 @@ python_wrapper_setup() { |
18 |
# overridden but hopefully it will be somewhere under ${T}. |
19 |
local ${lpyvar}=$(PATH=${PATH//${T}//dev/null} type -P "${EPYTHON}" || die "${FUNCNAME}: can't find ${EPYTHON} in PATH") |
20 |
|
21 |
- local pysysroot=${ESYSROOT-${SYSROOT%/}${EPREFIX}} |
22 |
+ if [[ ${CATEGORY}/${PN} == dev-lang/python ]]; then |
23 |
+ local pysysroot=${ED%/} |
24 |
+ else |
25 |
+ local pysysroot=${ESYSROOT-${SYSROOT%/}${EPREFIX}} |
26 |
+ fi |
27 |
|
28 |
if [[ ! -x ${workdir}/bin/python ]]; then |
29 |
_python_check_dead_variables |
30 |
-- |
31 |
2.19.2 |