diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2014-05-11 07:58:35 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2014-05-11 07:58:35 +0000 |
| commit | e0e8a11382c584d6b30a69a603d5ffccb261c50c (patch) | |
| tree | b969cba3bd07f19033d5e6cb2458687afe40e176 /eclass | |
| parent | amd64/x86 stable wrt #509962 (diff) | |
| download | historical-e0e8a11382c584d6b30a69a603d5ffccb261c50c.tar.gz historical-e0e8a11382c584d6b30a69a603d5ffccb261c50c.tar.bz2 historical-e0e8a11382c584d6b30a69a603d5ffccb261c50c.zip | |
Fail when package installs "share" subdirectory to PyPy prefix. This should stop people from adding PyPy support to packages that do not work due to the bug in PyPy.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 7 | ||||
| -rw-r--r-- | eclass/distutils-r1.eclass | 5 |
2 files changed, 10 insertions, 2 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 783dcfa33cd1..6422aec586e9 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for eclass directory # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1249 2014/05/10 21:36:49 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1250 2014/05/11 07:58:35 mgorny Exp $ + + 11 May 2014; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass: + Fail when package installs "share" subdirectory to PyPy prefix. This should + stop people from adding PyPy support to packages that do not work due to the + bug in PyPy. 10 May 2014; Michał Górny <mgorny@gentoo.org> multibuild.eclass: Remove the coreutils dependency since the old copying code has been replaced diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass index 9084f4c18473..5b592123822b 100644 --- a/eclass/distutils-r1.eclass +++ b/eclass/distutils-r1.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.94 2014/01/18 15:06:56 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.95 2014/05/11 07:58:35 mgorny Exp $ # @ECLASS: distutils-r1 # @MAINTAINER: @@ -538,6 +538,9 @@ distutils-r1_python_install() { if [[ -d ${root}$(python_get_sitedir)/tests ]]; then die "Package installs 'tests' package, file collisions likely." fi + if [[ -d ${root}/usr/$(get_libdir)/pypy/share ]]; then + die "Package installs 'share' in PyPy prefix, see bug #465546." + fi if [[ ! ${DISTUTILS_SINGLE_IMPL} ]]; then _distutils-r1_wrap_scripts "${root}" "${scriptdir}" |