packages: pypy/pypy.spec, pypy/pypy-cldflags.patch (NEW) - pass our CFLAGS, ...

[jajcus]

Author: jajcus                       Date: Fri Jul 15 13:03:39 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- pass our CFLAGS, LDFLAGS
- force '-j1' to make

---- Files affected:
packages/pypy:
   pypy.spec (1.5 -> 1.6) , pypy-cldflags.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/pypy/pypy.spec
diff -u packages/pypy/pypy.spec:1.5 packages/pypy/pypy.spec:1.6
--- packages/pypy/pypy.spec:1.5	Wed Jul 13 12:26:37 2011
+++ packages/pypy/pypy.spec	Fri Jul 15 15:03:33 2011
@@ -17,6 +17,7 @@
 Source0:	http://cdn.bitbucket.org/pypy/pypy/downloads/%{name}-%{version}-src.tar.bz2
 # Source0-md5:	cb9ada2c50666318c3a2863da1fbe487
 Patch0:		%{name}-curses.patch
+Patch1:		%{name}-cldflags.patch
 URL:		http://pypy.org
 BuildRequires:	rpm-pythonprov
 BuildRequires:	libffi-static
@@ -49,12 +50,14 @@
 %prep
 %setup -q -n %{name}-%{version}-src
 %patch0 -p1
+%patch1 -p1
 
 %build
 cd pypy/translator/goal
 CC="%{__cc}" \
 CFLAGS="%{rpmcflags}" \
-%{__python} translate.py -Ojit
+LDFLAGS="%{rpmldflags}" \
+%{__python} translate.py -Ojit --make-jobs=1
 cd ../../..
 
 %if %{with tests}
@@ -139,6 +142,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.6  2011/07/15 13:03:33  jajcus
+- pass our CFLAGS, LDFLAGS
+- force '-j1' to make
+
 Revision 1.5  2011/07/13 10:26:37  jajcus
 - 755 on the real binary
 

================================================================
Index: packages/pypy/pypy-cldflags.patch
diff -u /dev/null packages/pypy/pypy-cldflags.patch:1.1
--- /dev/null	Fri Jul 15 15:03:39 2011
+++ packages/pypy/pypy-cldflags.patch	Fri Jul 15 15:03:33 2011
@@ -0,0 +1,33 @@
+--- pypy-1.5-src/ctypes_configure/cbuild.py.orig	2011-07-15 14:21:20.195034442 +0200
++++ pypy-1.5-src/ctypes_configure/cbuild.py	2011-07-15 14:26:14.168404165 +0200
+@@ -376,7 +376,9 @@
+                 self.libraries.append('m')
+             if 'pthread' not in self.libraries:
+                 self.libraries.append('pthread')
+-            self.compile_extra += ['-O3', '-fomit-frame-pointer', '-pthread']
++            self.compile_extra += os.environ.get("CFLAGS", "").split()
++	    self.compile_extra += ['-fomit-frame-pointer', '-pthread']
++            self.link_extra += os.environ.get("LDFLAGS", "").split()
+             self.link_extra += ['-pthread']
+         if sys.platform == 'win32':
+             self.link_extra += ['/DEBUG'] # generate .pdb file
+--- pypy-1.5-src/pypy/translator/platform/linux.py.orig	2011-07-15 14:51:34.540868990 +0200
++++ pypy-1.5-src/pypy/translator/platform/linux.py	2011-07-15 14:53:13.945377438 +0200
+@@ -1,13 +1,14 @@
+ """Support for Linux."""
+ 
++import os
+ from pypy.translator.platform.posix import BasePosix
+ 
+ class BaseLinux(BasePosix):
+     name = "linux"
+     
+-    link_flags = ('-pthread', '-lrt')
+-    cflags = ('-O3', '-pthread', '-fomit-frame-pointer',
+-              '-Wall', '-Wno-unused')
++    link_flags = os.environ.get("LDFLAGS", "").split() + ['-pthread', '-lrt']
++    cflags = os.environ.get("CFLAGS", "").split() + ['-pthread', '-fomit-frame-pointer',
++              '-Wall', '-Wno-unused']
+     standalone_only = ()
+     shared_only = ('-fPIC',)
+     so_ext = 'so'
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/pypy/pypy.spec?r1=1.5&r2=1.6&f=u