diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2012-12-20 06:34:57 +0000 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2012-12-20 06:34:57 +0000 |
| commit | c966581f0f078be353841e0bad3b3c0f2a783210 (patch) | |
| tree | 79831928abfcffb26fe23d73c9b21a2f492d00b1 /eclass | |
| parent | Add pypy version mapping for 2.0 => 2.7. (diff) | |
| download | gentoo-2-c966581f0f078be353841e0bad3b3c0f2a783210.tar.gz gentoo-2-c966581f0f078be353841e0bad3b3c0f2a783210.tar.bz2 gentoo-2-c966581f0f078be353841e0bad3b3c0f2a783210.zip | |
Remove pypy version mapping table from wrapper scripts. We can add it back if pypy is ever ported to py3k and we are still using this eclass.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 6 | ||||
| -rw-r--r-- | eclass/python.eclass | 21 |
2 files changed, 16 insertions, 11 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 8696716a8d7b..fe6f0909f59e 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for eclass directory # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.569 2012/12/20 06:26:16 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.570 2012/12/20 06:34:57 floppym Exp $ + + 20 Dec 2012; Mike Gilbert <floppym@gentoo.org> python.eclass: + Remove pypy version mapping table from wrapper scripts. We can add it back if + pypy is ever ported to py3k and we are still using this eclass. 20 Dec 2012; Mike Gilbert <floppym@gentoo.org> python.eclass: Add pypy version mapping for 2.0 => 2.7. diff --git a/eclass/python.eclass b/eclass/python.eclass index bdbd1ea288c6..f83f2c24f183 100644 --- a/eclass/python.eclass +++ b/eclass/python.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/python.eclass,v 1.163 2012/12/20 06:26:16 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/python.eclass,v 1.164 2012/12/20 06:34:57 floppym Exp $ # @ECLASS: python.eclass # @MAINTAINER: @@ -1300,14 +1300,14 @@ cpython_shebang_re = re.compile(r"^#![ \t]*(?:${EPREFIX}/usr/bin/python|(?:${EPR python_shebang_options_re = re.compile(r"^#![ \t]*${EPREFIX}/usr/bin/(?:jython|pypy-c|python)(?:\d+(?:\.\d+)?)?[ \t]+(-\S)") python_verification_output_re = re.compile("^GENTOO_PYTHON_TARGET_SCRIPT_PATH supported\n$") -pypy_versions_mapping = { - "1.5": "2.7", - "1.6": "2.7", - "1.7": "2.7", - "1.8": "2.7", - "1.9": "2.7", - "2.0": "2.7", -} +#pypy_versions_mapping = { +# "1.5": "2.7", +# "1.6": "2.7", +# "1.7": "2.7", +# "1.8": "2.7", +# "1.9": "2.7", +# "2.0": "2.7", +#} def get_PYTHON_ABI(python_interpreter): cpython_matched = cpython_interpreter_re.match(python_interpreter) @@ -1318,7 +1318,8 @@ def get_PYTHON_ABI(python_interpreter): elif jython_matched is not None: PYTHON_ABI = jython_matched.group(1) + "-jython" elif pypy_matched is not None: - PYTHON_ABI = pypy_versions_mapping[pypy_matched.group(1)] + "-pypy-" + pypy_matched.group(1) + #PYTHON_ABI = pypy_versions_mapping[pypy_matched.group(1)] + "-pypy-" + pypy_matched.group(1) + PYTHON_ABI = "2.7-pypy-" + pypy_matched.group(1) else: PYTHON_ABI = None return PYTHON_ABI |