1.8
rebase to 1.8: * regenerate config patch (patch 0) * drop selinux patch (patch 2) * regenerate patch 5
This commit is contained in:
David Malcolm
parent
a8e52ca5f8
commit
52a91fcc4b
1
.gitignore
vendored
1
.gitignore
vendored
@ -2,3 +2,4 @@
|
||||
/pypy-1.5-src.tar.bz2
|
||||
/release-1.6.tar.bz2
|
||||
/release-1.7.tar.bz2
|
||||
/release-1.8.tar.bz2
|
||||
|
||||
32
config.patch
32
config.patch
@ -1,31 +1,7 @@
|
||||
diff -up pypy-pypy-release-1.7/pypy/translator/platform/linux.py.configure-fedora pypy-pypy-release-1.7/pypy/translator/platform/linux.py
|
||||
--- pypy-pypy-release-1.7/pypy/translator/platform/linux.py.configure-fedora 2011-11-19 02:44:54.000000000 -0500
|
||||
+++ pypy-pypy-release-1.7/pypy/translator/platform/linux.py 2011-11-21 13:07:03.454240019 -0500
|
||||
@@ -1,15 +1,21 @@
|
||||
"""Support for Linux."""
|
||||
|
||||
+import os
|
||||
import sys
|
||||
from pypy.translator.platform.posix import BasePosix
|
||||
|
||||
+CFLAGS = ['-O3', '-pthread', '-fomit-frame-pointer',
|
||||
+ '-Wall', '-Wno-unused']
|
||||
+if os.environ.get('CFLAGS', None):
|
||||
+ CFLAGS.extend(os.environ['CFLAGS'].split())
|
||||
+CFLAGS = tuple(CFLAGS)
|
||||
+
|
||||
class BaseLinux(BasePosix):
|
||||
name = "linux"
|
||||
|
||||
link_flags = ('-pthread',)
|
||||
extra_libs = ('-lrt',)
|
||||
- cflags = ('-O3', '-pthread', '-fomit-frame-pointer',
|
||||
- '-Wall', '-Wno-unused')
|
||||
+ cflags = CFLAGS
|
||||
standalone_only = ()
|
||||
shared_only = ('-fPIC',)
|
||||
so_ext = 'so'
|
||||
@@ -26,13 +32,14 @@ class BaseLinux(BasePosix):
|
||||
diff -up pypy-pypy-2346207d9946/pypy/translator/platform/linux.py.configure-fedora pypy-pypy-2346207d9946/pypy/translator/platform/linux.py
|
||||
--- pypy-pypy-2346207d9946/pypy/translator/platform/linux.py.configure-fedora 2012-02-09 13:27:19.000000000 -0500
|
||||
+++ pypy-pypy-2346207d9946/pypy/translator/platform/linux.py 2012-02-10 09:06:20.393066016 -0500
|
||||
@@ -31,13 +31,14 @@ class BaseLinux(BasePosix):
|
||||
return self._pkg_config("libffi", "--libs-only-L",
|
||||
['/usr/lib/libffi'])
|
||||
|
||||
|
||||
@ -1,11 +0,0 @@
|
||||
--- test/test_commands.py.orig 2010-12-22 13:25:11.357333216 -0500
|
||||
+++ test/test_commands.py 2010-12-22 13:25:57.927166219 -0500
|
||||
@@ -47,7 +47,7 @@ class CommandTests(unittest.TestCase):
|
||||
# Note that the first case above has a space in the group name
|
||||
# while the second one has a space in both names.
|
||||
pat = r'''d......... # It is a directory.
|
||||
- \+? # It may have ACLs.
|
||||
+ [.+@]? # It may have alt access (SELinux, ACLs or metadata ('@' OS X).
|
||||
\s+\d+ # It has some number of links.
|
||||
[^/]* # Skip user, group, size, and date.
|
||||
/\. # and end with the name of the file.
|
||||
@ -1,6 +1,5 @@
|
||||
diff -up pypy-pypy-release-1.6/lib-python/2.7/test/test_subprocess.py.non-readable-path pypy-pypy-release-1.6/lib-python/2.7/test/test_subprocess.py
|
||||
--- pypy-pypy-release-1.6/lib-python/2.7/test/test_subprocess.py.non-readable-path 2011-08-20 11:46:31.410646024 -0400
|
||||
+++ pypy-pypy-release-1.6/lib-python/2.7/test/test_subprocess.py 2011-08-20 11:46:39.421645476 -0400
|
||||
--- pypy-pypy-2346207d9946/lib-python/2.7/test/test_subprocess.py.orig 2012-02-09 13:27:19.000000000 -0500
|
||||
+++ pypy-pypy-2346207d9946/lib-python/2.7/test/test_subprocess.py 2012-02-10 09:14:08.312216221 -0500
|
||||
@@ -570,7 +570,7 @@ class ProcessTestCase(BaseTestCase):
|
||||
for i in range(1024):
|
||||
# Windows raises IOError. Others raise OSError.
|
||||
@ -9,4 +8,4 @@ diff -up pypy-pypy-release-1.6/lib-python/2.7/test/test_subprocess.py.non-readab
|
||||
+ subprocess.Popen(['/usr/bin/nonexisting_i_hope'],
|
||||
stdout=subprocess.PIPE,
|
||||
stderr=subprocess.PIPE)
|
||||
if c.exception.errno != errno.ENOENT: # ignore "no such file"
|
||||
# ignore errors that indicate the command was not found
|
||||
|
||||
18
pypy.spec
18
pypy.spec
@ -1,6 +1,6 @@
|
||||
Name: pypy
|
||||
Version: 1.7
|
||||
Release: 4%{?dist}
|
||||
Version: 1.8
|
||||
Release: 1%{?dist}
|
||||
Summary: Python implementation with a Just-In-Time compiler
|
||||
|
||||
Group: Development/Languages
|
||||
@ -145,10 +145,6 @@ Patch0: config.patch
|
||||
# merely render dots:
|
||||
Patch1: pypy-1.2-suppress-mandelbrot-set-during-tty-build.patch
|
||||
|
||||
# test_commmands fails on SELinux systems due to a change in the output
|
||||
# of "ls" (http://bugs.python.org/issue7108)
|
||||
Patch2: fix-test_commands-expected-ls-output-issue7108.patch
|
||||
|
||||
# Try to improve the readability of the generated .c code, by adding in the
|
||||
# RPython source as comments where possible.
|
||||
# A version of this was sent upstream as:
|
||||
@ -324,14 +320,10 @@ Build of PyPy with support for micro-threads for massive concurrency
|
||||
|
||||
|
||||
%prep
|
||||
%setup -q -n pypy-pypy-release-%{version}
|
||||
%setup -q -n pypy-pypy-2346207d9946
|
||||
%patch0 -p1 -b .configure-fedora
|
||||
%patch1 -p1 -b .suppress-mandelbrot-set-during-tty-build
|
||||
|
||||
pushd lib-python/%{pylibver}
|
||||
%patch2 -p0
|
||||
popd
|
||||
|
||||
%patch4 -p1 -b .more-readable-c-code
|
||||
|
||||
%patch5 -p1
|
||||
@ -868,6 +860,10 @@ rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
|
||||
%changelog
|
||||
* Thu Feb 9 2012 David Malcolm <dmalcolm@redhat.com> - 1.8-1
|
||||
- 1.8; regenerate config patch (patch 0); drop selinux patch (patch 2);
|
||||
regenerate patch 5
|
||||
|
||||
* Tue Jan 31 2012 David Malcolm <dmalcolm@redhat.com> - 1.7-4
|
||||
- fix an incompatibility with virtualenv (rhbz#742641)
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user