1 |
This is cleaner than delaying it to install_all(). |
2 |
--- |
3 |
gx86/eclass/distutils-r1.eclass | 23 +++++------------------ |
4 |
1 file changed, 5 insertions(+), 18 deletions(-) |
5 |
|
6 |
diff --git a/gx86/eclass/distutils-r1.eclass b/gx86/eclass/distutils-r1.eclass |
7 |
index fffa800..c21ab30 100644 |
8 |
--- a/gx86/eclass/distutils-r1.eclass |
9 |
+++ b/gx86/eclass/distutils-r1.eclass |
10 |
@@ -268,8 +268,11 @@ _distutils-r1_rename_scripts() { |
11 |
debug-print "${FUNCNAME}: matching shebang: $(head -n 1 "${f}")" |
12 |
|
13 |
local newf=${f}-${EPYTHON} |
14 |
- debug-print "${FUNCNAME}: renamed to ${newf#${D}/}" |
15 |
+ debug-print "${FUNCNAME}: renaming to ${newf#${D}/}" |
16 |
mv "${f}" "${newf}" || die |
17 |
+ |
18 |
+ debug-print "${FUNCNAME}: installing wrapper at ${f#${D}/}" |
19 |
+ _python_ln_rel "${path}"/usr/bin/python-exec "${f}" || die |
20 |
fi |
21 |
done < <(find "${path}" -type f -executable -print0) |
22 |
} |
23 |
@@ -309,9 +312,7 @@ distutils-r1_python_install() { |
24 |
|
25 |
# @FUNCTION: distutils-r1_python_install_all |
26 |
# @DESCRIPTION: |
27 |
-# The default python_install_all(). It symlinks wrappers |
28 |
-# for the implementation-suffixed executables and installs |
29 |
-# documentation. |
30 |
+# The default python_install_all(). It installs the documentation. |
31 |
distutils-r1_python_install_all() { |
32 |
debug-print-function ${FUNCNAME} "${@}" |
33 |
|
34 |
@@ -331,20 +332,6 @@ distutils-r1_python_install_all() { |
35 |
if declare -p HTML_DOCS &>/dev/null; then |
36 |
dohtml -r "${HTML_DOCS[@]}" || die "dohtml failed" |
37 |
fi |
38 |
- |
39 |
- # note: keep in sync with ...rename_scripts() |
40 |
- # also, we assume that each script is installed for all impls |
41 |
- local EPYTHON |
42 |
- python_export_best EPYTHON |
43 |
- |
44 |
- local f |
45 |
- while IFS= read -r -d '' f; do |
46 |
- debug-print "${FUNCNAME}: found executable at ${f#${D}/}" |
47 |
- |
48 |
- local wrapf=${f%-${EPYTHON}} |
49 |
- |
50 |
- _python_ln_rel "${ED}"/usr/bin/python-exec "${wrapf}" || die |
51 |
- done < <(find "${D}" -type f -executable -name "*-${EPYTHON}" -print0) |
52 |
} |
53 |
|
54 |
# @FUNCTION: distutils-r1_run_phase |
55 |
-- |
56 |
1.8.0 |