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