mgorny 15/07/27 16:34:10 Modified: ChangeLog python-utils-r1.eclass Log: python_wrapper_setup(): wrap pythonN-config as well as suggested by PEP and required by some applications, bug #555594.
Revision Changes Path 1.1730 eclass/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1730&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1730&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1729&r2=1.1730 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v retrieving revision 1.1729 retrieving revision 1.1730 diff -u -r1.1729 -r1.1730 --- ChangeLog 27 Jul 2015 16:32:46 -0000 1.1729 +++ ChangeLog 27 Jul 2015 16:34:10 -0000 1.1730 @@ -1,6 +1,10 @@ # ChangeLog for eclass directory # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1729 2015/07/27 16:32:46 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1730 2015/07/27 16:34:10 mgorny Exp $ + + 27 Jul 2015; Michał Górny <mgo...@gentoo.org> python-utils-r1.eclass: + python_wrapper_setup(): wrap pythonN-config as well as suggested by PEP and + required by some applications, bug #555594. 27 Jul 2015; Michał Górny <mgo...@gentoo.org> python-utils-r1.eclass: python_wrapper_setup(): replace symlinks with shell wrappers to avoid 1.86 eclass/python-utils-r1.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.86&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.86&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?r1=1.85&r2=1.86 Index: python-utils-r1.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v retrieving revision 1.85 retrieving revision 1.86 diff -u -r1.85 -r1.86 --- python-utils-r1.eclass 27 Jul 2015 16:32:46 -0000 1.85 +++ python-utils-r1.eclass 27 Jul 2015 16:34:10 -0000 1.86 @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v 1.85 2015/07/27 16:32:46 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v 1.86 2015/07/27 16:34:10 mgorny Exp $ # @ECLASS: python-utils-r1 # @MAINTAINER: @@ -873,7 +873,10 @@ #!/bin/sh exec "${PYTHON}-config" "\${@}" _EOF_ - chmod +x "${workdir}/bin/python-config" || die + cp "${workdir}/bin/python-config" \ + "${workdir}/bin/python${pyver}-config" || die + chmod +x "${workdir}/bin/python-config" \ + "${workdir}/bin/python${pyver}-config" || die # Python 2.6+. ln -s "${PYTHON/python/2to3-}" "${workdir}"/bin/2to3 || die @@ -883,7 +886,7 @@ "${workdir}"/pkgconfig/python.pc || die ln -s python.pc "${workdir}"/pkgconfig/python${pyver}.pc || die else - nonsupp+=( 2to3 python-config ) + nonsupp+=( 2to3 python-config "python${pyver}-config" ) fi local x