[packages/pypy] Testing update to 1.9, added ncurses test.

matkor matkor at pld-linux.org
Fri Aug 3 12:23:41 CEST 2012


commit cd5c7a23f33025634104cf1eb21827555fd95285
Author: Mateusz Korniak <matkor at pld-linux.org>
Date:   Fri Aug 3 12:00:57 2012 +0200

    Testing update to 1.9, added ncurses test.

 pypy-curses.patch | 21 +++++++++++++--------
 pypy.spec         | 16 ++++++++++------
 2 files changed, 23 insertions(+), 14 deletions(-)
---
diff --git a/pypy-curses.patch b/pypy-curses.patch
index 43fe947..342c09f 100644
--- a/pypy-curses.patch
+++ b/pypy-curses.patch
@@ -1,11 +1,16 @@
---- pypy-pypy-release-1.7/pypy/module/_minimal_curses/fficurses.py~	2011-11-19 08:44:54.000000000 +0100
-+++ pypy-pypy-release-1.7/pypy/module/_minimal_curses/fficurses.py	2012-02-02 14:10:59.067360229 +0100
-@@ -10,7 +10,7 @@
+--- ./pypy/module/_minimal_curses/fficurses.py.curses	2012-06-07 14:24:48.000000000 +0200
++++ ./pypy/module/_minimal_curses/fficurses.py	2012-08-03 11:54:28.717067645 +0200
+@@ -9,10 +9,12 @@ from pypy.rpython.extfunc import registe
+ from pypy.module._minimal_curses import interp_curses
  from pypy.translator.tool.cbuild import ExternalCompilationInfo
+ from sys import platform
++import os.path
  
- eci = ExternalCompilationInfo(
--    includes = ['curses.h', 'term.h'],
-+    includes = ['ncurses/curses.h', 'ncurses/term.h'],
-     libraries = ['curses'],
- )
+ _CYGWIN = platform == 'cygwin'
++_NCURSES_CURSES = os.path.isfile("/usr/include/ncurses/curses.h") 
  
+-if _CYGWIN:
++if _CYGWIN or _NCURSES_CURSES:
+     eci = ExternalCompilationInfo(
+         includes = ['ncurses/curses.h', 'ncurses/term.h'],
+         libraries = ['curses'],
diff --git a/pypy.spec b/pypy.spec
index 480c6ca..916fc17 100644
--- a/pypy.spec
+++ b/pypy.spec
@@ -1,4 +1,6 @@
-#
+# TODO:
+# - Reviow commented patch
+
 # Conditional build:
 %bcond_with	tests		# do perform tests
 %bcond_with	bootstrap	# use Python2 instead of PyPy
@@ -9,12 +11,12 @@
 
 Summary:	PyPy - a fast, alternative implementation of the Python language
 Name:		pypy
-Version:	1.7
-Release:	2
+Version:	1.9
+Release:	0.2
 License:	distributable
 Group:		Development/Languages/Python
 Source0:	https://bitbucket.org/pypy/pypy/get/release-%{version}.tar.bz2
-# Source0-md5:	fc22184c931ead98bdae9ec3e79595c2
+# Source0-md5:	f92c0171a9578a3e4a0f74947ec596ab
 Patch0:		%{name}-curses.patch
 Patch1:		%{name}-cldflags.patch
 URL:		http://pypy.org
@@ -50,11 +52,13 @@ language (2.7.1). It has several advantages and distinct features:
 - As well as other features.
 
 %prep
-%setup -q -n %{name}-%{name}-release-%{version}
+# %setup -q -n %{name}-%{name}-release-%{version}
+%setup -q -n %{name}-%{name}-341e1e3821ff
 %patch0 -p1
-%patch1 -p1
+# %patch1 -p1
 
 %build
+
 cd pypy/translator/goal
 CC="%{__cc}" \
 CFLAGS="%{rpmcflags}" \


More information about the pld-cvs-commit mailing list