| 1 |
Signed-off-by: Michał Górny <mgorny@g.o> |
| 2 |
--- |
| 3 |
eclass/python-any-r2.eclass | 8 ++++---- |
| 4 |
eclass/python-r2.eclass | 4 ++-- |
| 5 |
eclass/python-single-r2.eclass | 4 ++-- |
| 6 |
eclass/python-utils-r2.eclass | 5 +++-- |
| 7 |
4 files changed, 11 insertions(+), 10 deletions(-) |
| 8 |
|
| 9 |
diff --git a/eclass/python-any-r2.eclass b/eclass/python-any-r2.eclass |
| 10 |
index 08e424254983..c680d383fef6 100644 |
| 11 |
--- a/eclass/python-any-r2.eclass |
| 12 |
+++ b/eclass/python-any-r2.eclass |
| 13 |
@@ -299,7 +299,7 @@ python_setup() { |
| 14 |
ewarn "Dependencies won't be satisfied, and EPYTHON/eselect-python will be ignored." |
| 15 |
|
| 16 |
python_export "${impls[0]}" EPYTHON PYTHON |
| 17 |
- python_wrapper_setup |
| 18 |
+ _python_wrapper_setup |
| 19 |
einfo "Using ${EPYTHON} to build" |
| 20 |
return |
| 21 |
fi |
| 22 |
@@ -308,7 +308,7 @@ python_setup() { |
| 23 |
if [[ ${EPYTHON} ]]; then |
| 24 |
if _python_EPYTHON_supported "${EPYTHON}"; then |
| 25 |
python_export EPYTHON PYTHON |
| 26 |
- python_wrapper_setup |
| 27 |
+ _python_wrapper_setup |
| 28 |
einfo "Using ${EPYTHON} to build" |
| 29 |
return |
| 30 |
fi |
| 31 |
@@ -324,7 +324,7 @@ python_setup() { |
| 32 |
break |
| 33 |
elif _python_EPYTHON_supported "${i}"; then |
| 34 |
python_export "${i}" EPYTHON PYTHON |
| 35 |
- python_wrapper_setup |
| 36 |
+ _python_wrapper_setup |
| 37 |
einfo "Using ${EPYTHON} to build" |
| 38 |
return |
| 39 |
fi |
| 40 |
@@ -335,7 +335,7 @@ python_setup() { |
| 41 |
for (( i = ${#_PYTHON_SUPPORTED_IMPLS[@]} - 1; i >= 0; i-- )); do |
| 42 |
python_export "${_PYTHON_SUPPORTED_IMPLS[i]}" EPYTHON PYTHON |
| 43 |
if _python_EPYTHON_supported "${EPYTHON}"; then |
| 44 |
- python_wrapper_setup |
| 45 |
+ _python_wrapper_setup |
| 46 |
einfo "Using ${EPYTHON} to build" |
| 47 |
return |
| 48 |
fi |
| 49 |
diff --git a/eclass/python-r2.eclass b/eclass/python-r2.eclass |
| 50 |
index 20d80940c31f..64b3742fc08f 100644 |
| 51 |
--- a/eclass/python-r2.eclass |
| 52 |
+++ b/eclass/python-r2.eclass |
| 53 |
@@ -596,7 +596,7 @@ _python_multibuild_wrapper() { |
| 54 |
local -x EPYTHON PYTHON |
| 55 |
local -x PATH=${PATH} PKG_CONFIG_PATH=${PKG_CONFIG_PATH} |
| 56 |
python_export "${MULTIBUILD_VARIANT}" EPYTHON PYTHON |
| 57 |
- python_wrapper_setup |
| 58 |
+ _python_wrapper_setup |
| 59 |
|
| 60 |
"${@}" |
| 61 |
} |
| 62 |
@@ -742,7 +742,7 @@ python_setup() { |
| 63 |
die "${FUNCNAME}: no enabled implementation satisfy requirements" |
| 64 |
fi |
| 65 |
|
| 66 |
- python_wrapper_setup |
| 67 |
+ _python_wrapper_setup |
| 68 |
einfo "Using ${EPYTHON} in global scope" |
| 69 |
} |
| 70 |
|
| 71 |
diff --git a/eclass/python-single-r2.eclass b/eclass/python-single-r2.eclass |
| 72 |
index d9d535711252..0bd4d84eaa52 100644 |
| 73 |
--- a/eclass/python-single-r2.eclass |
| 74 |
+++ b/eclass/python-single-r2.eclass |
| 75 |
@@ -465,7 +465,7 @@ python_setup() { |
| 76 |
ewarn "Dependencies won't be satisfied, and PYTHON_SINGLE_TARGET flags will be ignored." |
| 77 |
|
| 78 |
python_export "${impls[0]}" EPYTHON PYTHON |
| 79 |
- python_wrapper_setup |
| 80 |
+ _python_wrapper_setup |
| 81 |
einfo "Using ${EPYTHON} to build" |
| 82 |
return |
| 83 |
fi |
| 84 |
@@ -483,7 +483,7 @@ python_setup() { |
| 85 |
fi |
| 86 |
|
| 87 |
python_export "${impl}" EPYTHON PYTHON |
| 88 |
- python_wrapper_setup |
| 89 |
+ _python_wrapper_setup |
| 90 |
einfo "Using ${EPYTHON} to build" |
| 91 |
fi |
| 92 |
done |
| 93 |
diff --git a/eclass/python-utils-r2.eclass b/eclass/python-utils-r2.eclass |
| 94 |
index fe129f48c9c9..b49cd7cc6341 100644 |
| 95 |
--- a/eclass/python-utils-r2.eclass |
| 96 |
+++ b/eclass/python-utils-r2.eclass |
| 97 |
@@ -946,8 +946,9 @@ python_doheader() { |
| 98 |
) |
| 99 |
} |
| 100 |
|
| 101 |
-# @FUNCTION: python_wrapper_setup |
| 102 |
+# @FUNCTION: _python_wrapper_setup |
| 103 |
# @USAGE: [<path> [<impl>]] |
| 104 |
+# @INTERNAL |
| 105 |
# @DESCRIPTION: |
| 106 |
# Create proper 'python' executable and pkg-config wrappers |
| 107 |
# (if available) in the directory named by <path>. Set up PATH |
| 108 |
@@ -960,7 +961,7 @@ python_doheader() { |
| 109 |
# be assumed to contain proper wrappers already and only environment |
| 110 |
# setup will be done. If wrapper update is requested, the directory |
| 111 |
# shall be removed first. |
| 112 |
-python_wrapper_setup() { |
| 113 |
+_python_wrapper_setup() { |
| 114 |
debug-print-function ${FUNCNAME} "${@}" |
| 115 |
|
| 116 |
local workdir=${1:-${T}/${EPYTHON}} |
| 117 |
-- |
| 118 |
2.25.1 |
Archives