1 |
On Sat, Jul 25, 2015 at 10:12:48PM +0800, Jason Zaman wrote: |
2 |
> On Sat, Jul 25, 2015 at 12:37:42PM +0200, Michał Górny wrote: |
3 |
> > Fixes: https://bugs.gentoo.org/show_bug.cgi?id=555594 |
4 |
> > --- |
5 |
> > eclass/python-utils-r1.eclass | 7 +++++-- |
6 |
> > 1 file changed, 5 insertions(+), 2 deletions(-) |
7 |
> > |
8 |
> > diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass |
9 |
> > index c1c5ea6..69d3262 100644 |
10 |
> > --- a/eclass/python-utils-r1.eclass |
11 |
> > +++ b/eclass/python-utils-r1.eclass |
12 |
> > @@ -873,7 +873,10 @@ python_wrapper_setup() { |
13 |
> > #!/bin/sh |
14 |
> > exec "${PYTHON}-config" "\${@}" |
15 |
> > _EOF_ |
16 |
> > - chmod +x "${workdir}/bin/python-config" || die |
17 |
> > + cp "${workdir}/bin/python-config" \ |
18 |
> > + "${workdir}/bin/python${pyver}-config" || die |
19 |
> > + chmod +x "${workdir}/bin/python-config" \ |
20 |
> > + "${workdir}/bin/python${pyver}-config" || die |
21 |
> |
22 |
> This could alternatively be python as a symlink -> python3 which is the |
23 |
> wrapper, but I dont think having two wrappers vs symlink to a wrapper |
24 |
> makes any real difference. |
25 |
> > |
26 |
> > # Python 2.6+. |
27 |
> > ln -s "${PYTHON/python/2to3-}" "${workdir}"/bin/2to3 || die |
28 |
> > @@ -883,7 +886,7 @@ python_wrapper_setup() { |
29 |
> > "${workdir}"/pkgconfig/python.pc || die |
30 |
> > ln -s python.pc "${workdir}"/pkgconfig/python${pyver}.pc || die |
31 |
> > else |
32 |
> > - nonsupp+=( 2to3 python-config ) |
33 |
> > + nonsupp+=( 2to3 python-config "python${pyver}-config" ) |
34 |
> |
35 |
> This should be both 2 and 3, if its not CPython, neither should be |
36 |
> allowed, this bans only $pyver. |
37 |
|
38 |
The other patch adds $pyother earlier on, so this is correct. My |
39 |
mistake. |