Gentoo Archives: gentoo-dev

From: "Michał Górny" <mgorny@g.o>
To: gentoo-dev@l.g.o
Cc: "Michał Górny" <mgorny@g.o>
Subject: [gentoo-dev] [PATCH 05/18] distutils-r1.eclass: Remove the obsolete pypy/share check
Date: Sat, 04 Jun 2022 09:05:44
Message-Id: 20220604090334.4003-6-mgorny@gentoo.org
In Reply to: [gentoo-dev] [PATCH 00/18] distutils-r1.eclass D_U_PEP517=no mode & other patches by "Michał Górny"
1 The PyPy 'share' directory check was necessary because of the historical
2 prefix logic that we patched in Gentoo. All modern versions of PyPy
3 use '/usr' as sys.prefix natively, so the check is no longer needed.
4
5 Signed-off-by: Michał Górny <mgorny@g.o>
6 ---
7 eclass/distutils-r1.eclass | 12 ------------
8 1 file changed, 12 deletions(-)
9
10 diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
11 index 30391ad67f3a..b0318410b100 100644
12 --- a/eclass/distutils-r1.eclass
13 +++ b/eclass/distutils-r1.eclass
14 @@ -1839,18 +1839,6 @@ _distutils-r1_post_python_install() {
15 die "Package installs '${p}' package which is forbidden and likely a bug in the build system."
16 fi
17 done
18 -
19 - local shopt_save=$(shopt -p nullglob)
20 - shopt -s nullglob
21 - local pypy_dirs=(
22 - "${D}${EPREFIX}/usr/$(get_libdir)"/pypy*/share
23 - "${D}${EPREFIX}/usr/lib"/pypy*/share
24 - )
25 - ${shopt_save}
26 -
27 - if [[ -n ${pypy_dirs} ]]; then
28 - die "Package installs 'share' in PyPy prefix, see bug #465546."
29 - fi
30 }
31
32 # @FUNCTION: _distutils-r1_check_namespace_pth
33 --
34 2.35.1