Gentoo Archives: gentoo-dev

From: "Michał Górny" <mgorny@g.o>
To: gentoo-dev@l.g.o
Cc: python@g.o, "Michał Górny" <mgorny@g.o>
Subject: [gentoo-dev] [PATCH 2/3] python-utils-r1.eclass: Do not create 'python.pc' wrapper
Date: Sat, 14 Mar 2020 19:53:53
Message-Id: 20200314195242.392518-3-mgorny@gentoo.org
In Reply to: [gentoo-dev] [PATCH 0/3] distutils-r1, python-utils-r1: bump setuptools dep & fix creating python3-embed.pc by "Michał Górny"
1 Do not create 'python.pc', only 'python[23].pc'. This seems to match
2 what other distributions are doing.
3
4 Signed-off-by: Michał Górny <mgorny@g.o>
5 ---
6 eclass/python-utils-r1.eclass | 5 ++---
7 1 file changed, 2 insertions(+), 3 deletions(-)
8
9 diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
10 index 325964e0e0e8..28314d5135d0 100644
11 --- a/eclass/python-utils-r1.eclass
12 +++ b/eclass/python-utils-r1.eclass
13 @@ -978,7 +978,7 @@ python_wrapper_setup() {
14 # Clean up, in case we were supposed to do a cheap update.
15 rm -f "${workdir}"/bin/python{,2,3}{,-config} || die
16 rm -f "${workdir}"/bin/2to3 || die
17 - rm -f "${workdir}"/pkgconfig/python{,2,3}.pc || die
18 + rm -f "${workdir}"/pkgconfig/python{2,3}.pc || die
19
20 local EPYTHON PYTHON
21 python_export "${impl}" EPYTHON PYTHON
22 @@ -1021,8 +1021,7 @@ python_wrapper_setup() {
23
24 # Python 2.7+.
25 ln -s "${EPREFIX}"/usr/$(get_libdir)/pkgconfig/${EPYTHON/n/n-}.pc \
26 - "${workdir}"/pkgconfig/python.pc || die
27 - ln -s python.pc "${workdir}"/pkgconfig/python${pyver}.pc || die
28 + "${workdir}"/pkgconfig/python${pyver}.pc || die
29 else
30 nonsupp+=( 2to3 python-config "python${pyver}-config" )
31 fi
32 --
33 2.25.1