From: "Mike Gilbert (floppym)" <floppym@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python.eclass
Date: Thu, 20 Dec 2012 06:34:57 +0000 (UTC) [thread overview]
Message-ID: <20121220063457.BAA602171D@flycatcher.gentoo.org> (raw)
floppym 12/12/20 06:34:57
Modified: ChangeLog python.eclass
Log:
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.
Revision Changes Path
1.570 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.570&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.570&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.569&r2=1.570
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.569
retrieving revision 1.570
diff -u -r1.569 -r1.570
--- ChangeLog 20 Dec 2012 06:26:16 -0000 1.569
+++ ChangeLog 20 Dec 2012 06:34:57 -0000 1.570
@@ -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.
1.164 eclass/python.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python.eclass?rev=1.164&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python.eclass?rev=1.164&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python.eclass?r1=1.163&r2=1.164
Index: python.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python.eclass,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -r1.163 -r1.164
--- python.eclass 20 Dec 2012 06:26:16 -0000 1.163
+++ python.eclass 20 Dec 2012 06:34:57 -0000 1.164
@@ -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 @@
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 @@
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
next reply other threads:[~2012-12-20 6:35 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-20 6:34 Mike Gilbert (floppym) [this message]
-- strict thread matches above, loose matches on Subject: below --
2013-09-18 18:47 [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python.eclass Michal Gorny (mgorny)
2013-03-07 21:02 Tim Harder (radhermit)
2013-03-02 12:54 Michal Gorny (mgorny)
2012-12-20 6:26 Mike Gilbert (floppym)
2012-12-20 6:07 Mike Gilbert (floppym)
2012-10-02 1:22 Mike Gilbert (floppym)
2012-09-27 22:42 Mike Gilbert (floppym)
2012-09-27 15:41 Mike Gilbert (floppym)
2012-08-16 23:57 Mike Gilbert (floppym)
2012-06-09 10:01 Marien Zwart (marienz)
2012-03-29 12:47 Marien Zwart (marienz)
2012-03-20 20:37 Mike Gilbert (floppym)
2012-03-07 4:13 Mike Gilbert (floppym)
2012-02-27 3:57 Mike Gilbert (floppym)
2012-02-13 23:50 Zac Medico (zmedico)
2012-02-10 22:54 Thomas Sachau (tommy)
2012-01-30 22:04 Mike Gilbert (floppym)
2012-01-30 20:18 Mike Gilbert (floppym)
2012-01-21 19:48 Mike Gilbert (floppym)
2011-12-18 23:38 Robin H. Johnson (robbat2)
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20121220063457.BAA602171D@flycatcher.gentoo.org \
--to=floppym@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox