1 |
--- |
2 |
gx86/eclass/python-r1.eclass | 30 +++++++++--------------------- |
3 |
1 file changed, 9 insertions(+), 21 deletions(-) |
4 |
|
5 |
diff --git a/gx86/eclass/python-r1.eclass b/gx86/eclass/python-r1.eclass |
6 |
index 934f32d..36b20dc 100644 |
7 |
--- a/gx86/eclass/python-r1.eclass |
8 |
+++ b/gx86/eclass/python-r1.eclass |
9 |
@@ -348,34 +348,22 @@ python_gen_cond_dep() { |
10 |
|
11 |
# @FUNCTION: python_copy_sources |
12 |
# @DESCRIPTION: |
13 |
-# Create a single copy of the package sources (${S}) for each enabled |
14 |
-# Python implementation. |
15 |
+# Create a single copy of the package sources for each enabled Python |
16 |
+# implementation. |
17 |
# |
18 |
-# The sources are always copied from S to implementation-specific build |
19 |
-# directories respecting BUILD_DIR. |
20 |
+# The sources are always copied from initial BUILD_DIR (or S if unset) |
21 |
+# to implementation-specific build directory matching BUILD_DIR used by |
22 |
+# python_foreach_abi(). |
23 |
python_copy_sources() { |
24 |
debug-print-function ${FUNCNAME} "${@}" |
25 |
|
26 |
_python_validate_useflags |
27 |
+ _python_check_USE_PYTHON |
28 |
|
29 |
- local impl |
30 |
- local bdir=${BUILD_DIR:-${S}} |
31 |
- |
32 |
- debug-print "${FUNCNAME}: bdir = ${bdir}" |
33 |
- einfo "Will copy sources from ${S}" |
34 |
- # the order is irrelevant here |
35 |
- for impl in "${PYTHON_COMPAT[@]}"; do |
36 |
- _python_impl_supported "${impl}" || continue |
37 |
- |
38 |
- if use "python_targets_${impl}" |
39 |
- then |
40 |
- local BUILD_DIR=${bdir%%/}-${impl} |
41 |
+ local MULTIBUILD_VARIANTS |
42 |
+ _python_obtain_impls |
43 |
|
44 |
- einfo "${impl}: copying to ${BUILD_DIR}" |
45 |
- debug-print "${FUNCNAME}: [${impl}] cp ${S} => ${BUILD_DIR}" |
46 |
- cp -pr "${S}" "${BUILD_DIR}" || die |
47 |
- fi |
48 |
- done |
49 |
+ multibuild_copy_sources |
50 |
} |
51 |
|
52 |
# @FUNCTION: _python_check_USE_PYTHON |
53 |
-- |
54 |
1.8.1.5 |