1 |
commit: 7e20289625d5fd9589d050b41a60bf8819238dde |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Feb 16 13:11:35 2019 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Feb 16 13:12:18 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e202896 |
7 |
|
8 |
distutils-r1.eclass: Fix pypy prefix check for new paths |
9 |
|
10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
11 |
|
12 |
eclass/distutils-r1.eclass | 11 ++++++++++- |
13 |
1 file changed, 10 insertions(+), 1 deletion(-) |
14 |
|
15 |
diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass |
16 |
index fa7a3ab5c12..66920d1f755 100644 |
17 |
--- a/eclass/distutils-r1.eclass |
18 |
+++ b/eclass/distutils-r1.eclass |
19 |
@@ -597,7 +597,16 @@ distutils-r1_python_install() { |
20 |
die "Package installs '${p}' package which is forbidden and likely a bug in the build system." |
21 |
fi |
22 |
done |
23 |
- if [[ -d ${root}/usr/$(get_libdir)/pypy/share ]]; then |
24 |
+ |
25 |
+ local shopt_save=$(shopt -p nullglob) |
26 |
+ shopt -s nullglob |
27 |
+ local pypy_dirs=( |
28 |
+ "${root}/usr/$(get_libdir)"/pypy*/share |
29 |
+ "${root}/usr/lib"/pypy*/share |
30 |
+ ) |
31 |
+ ${shopt_save} |
32 |
+ |
33 |
+ if [[ -n ${pypy_dirs} ]]; then |
34 |
local cmd=die |
35 |
[[ ${EAPI} == [45] ]] && cmd=eqawarn |
36 |
"${cmd}" "Package installs 'share' in PyPy prefix, see bug #465546." |