Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=wipv.git;a=commitdiff;h=7ab3880a44d22cbfa1484684e6e5e897f03875c6
commit 7ab3880a44d22cbfa1484684e6e5e897f03875c6
Author: Miklos Vajna <vmik...@frugalware.org>
Date: Thu Sep 2 02:14:57 2010 +0200
psyco-1.6-3-i686
- rebuilt with python-2.7
diff --git a/source/devel-extra/psyco/FrugalBuild
b/source/devel-extra/psyco/FrugalBuild
index 412ac32..04d6ffe 100644
--- a/source/devel-extra/psyco/FrugalBuild
+++ b/source/devel-extra/psyco/FrugalBuild
@@ -3,13 +3,15 @@
pkgname=psyco
pkgver=1.6
-pkgrel=2
+pkgrel=3
pkgdesc="Can massively speed up the execution of any Python code."
-depends=('python>=2.6')
+depends=('python>=2.7')
groups=('devel-extra')
archs=('i686' '!x86_64')
_F_sourceforge_ext="-src.tar.gz"
Finclude sourceforge
url="http://psyco.sourceforge.net/";
# optimization OK
-sha1sums=('3c1ffa70b1a37bd855454d41d41a830e9ea82e7d')
+source=($source python-2.7.patch)
+sha1sums=('3c1ffa70b1a37bd855454d41d41a830e9ea82e7d' \
+ 'fd21db5b574f7d1272e4f629b60eb743c065280c')
diff --git a/source/devel-extra/psyco/python-2.7.patch
b/source/devel-extra/psyco/python-2.7.patch
new file mode 100644
index 0000000..4f30234
--- /dev/null
+++ b/source/devel-extra/psyco/python-2.7.patch
@@ -0,0 +1,42 @@
+From https://bugzilla.redhat.com/attachment.cgi?id=436883
+
+FIXME: See https://bugzilla.redhat.com/show_bug.cgi?id=620211, this
+makes it build, but it may be still problematic at runtime.
+
+diff -up ./c/mergepoints.c.python27 ./c/mergepoints.c
+--- ./c/mergepoints.c.python27 2007-08-14 19:15:39.000000000 +0200
++++ ./c/mergepoints.c 2010-08-03 14:02:53.312329431 +0200
+@@ -47,8 +47,8 @@ static char* NoControlFlowIfBuiltin[] =
+
+ /* instructions with a target: */
+ #define HAS_JREL_INSTR(op) (op == JUMP_FORWARD || \
+- op == JUMP_IF_FALSE || \
+- op == JUMP_IF_TRUE || \
++ op == JUMP_IF_FALSE_OR_POP || \
++ op == JUMP_IF_TRUE_OR_POP || \
+ op == FOR_ITER || \
+ /* SETUP_LOOP replaced by FOR_ITER */ \
+ op == SETUP_EXCEPT || \
+diff -up ./c/Python/pycompiler.c.python27 ./c/Python/pycompiler.c
+--- ./c/Python/pycompiler.c.python27 2007-12-06 13:58:22.000000000 +0100
++++ ./c/Python/pycompiler.c 2010-08-03 14:03:10.274329433 +0200
+@@ -2806,8 +2806,8 @@ code_t* psyco_pycompiler_mainloop(PsycoO
+ mp = psyco_next_merge_point(po->pr.merge_points, next_instr);
+ goto fine;
+
+- case JUMP_IF_TRUE:
+- case JUMP_IF_FALSE:
++ case JUMP_IF_TRUE_OR_POP:
++ case JUMP_IF_FALSE_OR_POP:
+ /* This code is very different from the original
+ interpreter's, because we generally do not know the
+ outcome of PyObject_IsTrue(). In the case of JUMP_IF_xxx
+@@ -2816,7 +2816,7 @@ code_t* psyco_pycompiler_mainloop(PsycoO
+ cc = integer_NON_NULL(po, PsycoObject_IsTrue(po, TOP()));
+ if (cc == CC_ERROR)
+ break;
+- if (opcode == JUMP_IF_FALSE)
++ if (opcode == JUMP_IF_FALSE_OR_POP)
+ cc = INVERT_CC(cc);
+ if ((int)cc < CC_TOTAL) {
+ /* compile the beginning of the "if true" path */
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
