diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2019-02-16 14:11:35 +0100 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2019-02-16 14:12:18 +0100 |
| commit | 7e20289625d5fd9589d050b41a60bf8819238dde (patch) | |
| tree | d53b40eb0038b468f7833c7c00b088b166e4e784 /eclass | |
| parent | www-apps/roundup: Version bump to 1.6.0 (diff) | |
| download | gentoo-7e20289625d5fd9589d050b41a60bf8819238dde.tar.gz gentoo-7e20289625d5fd9589d050b41a60bf8819238dde.tar.bz2 gentoo-7e20289625d5fd9589d050b41a60bf8819238dde.zip | |
distutils-r1.eclass: Fix pypy prefix check for new paths
Signed-off-by: Michał Górny <mgorny@gentoo.org>
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/distutils-r1.eclass | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass index fa7a3ab5c12b..66920d1f7553 100644 --- a/eclass/distutils-r1.eclass +++ b/eclass/distutils-r1.eclass @@ -597,7 +597,16 @@ distutils-r1_python_install() { die "Package installs '${p}' package which is forbidden and likely a bug in the build system." fi done - if [[ -d ${root}/usr/$(get_libdir)/pypy/share ]]; then + + local shopt_save=$(shopt -p nullglob) + shopt -s nullglob + local pypy_dirs=( + "${root}/usr/$(get_libdir)"/pypy*/share + "${root}/usr/lib"/pypy*/share + ) + ${shopt_save} + + if [[ -n ${pypy_dirs} ]]; then local cmd=die [[ ${EAPI} == [45] ]] && cmd=eqawarn "${cmd}" "Package installs 'share' in PyPy prefix, see bug #465546." |