Rebase to 1.5 (rhbz#701121)
Update patches:
patch 0: pypy-1.4-config.patch -> pypy-1.5-config.patch
patch 4: pypy-1.4.1-more-readable-c-code.patch -> pypy-1.5-more-readable-c-code.patch
Remove references to *.inl files, no longer present
Add the following tests to the skip list:
test_audioop, test_capi, test_distutils, test_gc, test_gdb, test_generators,
test_getargs2, test_hotshot, test_io, test_multiprocessing, test_posix,
test_readline, test_scope, test_strop, test_structmembers, test_subprocess,
test_symtable, test_sys_settrace, test_tempfile, test_thread, test_uuid,
test_zipimport_support
Add a couple of text files to the payload (TODO, stdlib-version.txt)
2011-05-02 18:46:32 +00:00
|
|
|
diff -up pypy-1.5-src/pypy/translator/platform/linux.py.configure-fedora pypy-1.5-src/pypy/translator/platform/linux.py
|
|
|
|
--- pypy-1.5-src/pypy/translator/platform/linux.py.configure-fedora 2011-04-30 10:18:50.000000000 -0400
|
|
|
|
+++ pypy-1.5-src/pypy/translator/platform/linux.py 2011-04-30 18:59:24.041160978 -0400
|
|
|
|
@@ -1,13 +1,18 @@
|
|
|
|
"""Support for Linux."""
|
|
|
|
-
|
|
|
|
+import os
|
2011-01-03 20:06:28 +00:00
|
|
|
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', '-lrt')
|
|
|
|
- cflags = ('-O3', '-pthread', '-fomit-frame-pointer',
|
|
|
|
- '-Wall', '-Wno-unused')
|
|
|
|
+ cflags = CFLAGS
|
|
|
|
standalone_only = ()
|
|
|
|
shared_only = ('-fPIC',)
|
|
|
|
so_ext = 'so'
|
Rebase to 1.5 (rhbz#701121)
Update patches:
patch 0: pypy-1.4-config.patch -> pypy-1.5-config.patch
patch 4: pypy-1.4.1-more-readable-c-code.patch -> pypy-1.5-more-readable-c-code.patch
Remove references to *.inl files, no longer present
Add the following tests to the skip list:
test_audioop, test_capi, test_distutils, test_gc, test_gdb, test_generators,
test_getargs2, test_hotshot, test_io, test_multiprocessing, test_posix,
test_readline, test_scope, test_strop, test_structmembers, test_subprocess,
test_symtable, test_sys_settrace, test_tempfile, test_thread, test_uuid,
test_zipimport_support
Add a couple of text files to the payload (TODO, stdlib-version.txt)
2011-05-02 18:46:32 +00:00
|
|
|
@@ -29,9 +34,10 @@ class Linux(BaseLinux):
|
2011-01-03 20:06:28 +00:00
|
|
|
shared_only = () # it seems that on 32-bit linux, compiling with -fPIC
|
|
|
|
# gives assembler that asmgcc is not happy about.
|
Rebase to 1.5 (rhbz#701121)
Update patches:
patch 0: pypy-1.4-config.patch -> pypy-1.5-config.patch
patch 4: pypy-1.4.1-more-readable-c-code.patch -> pypy-1.5-more-readable-c-code.patch
Remove references to *.inl files, no longer present
Add the following tests to the skip list:
test_audioop, test_capi, test_distutils, test_gc, test_gdb, test_generators,
test_getargs2, test_hotshot, test_io, test_multiprocessing, test_posix,
test_readline, test_scope, test_strop, test_structmembers, test_subprocess,
test_symtable, test_sys_settrace, test_tempfile, test_thread, test_uuid,
test_zipimport_support
Add a couple of text files to the payload (TODO, stdlib-version.txt)
2011-05-02 18:46:32 +00:00
|
|
|
|
2011-01-03 20:06:28 +00:00
|
|
|
- def library_dirs_for_libffi_a(self):
|
|
|
|
- # places where we need to look for libffi.a
|
|
|
|
- return self.library_dirs_for_libffi() + ['/usr/lib']
|
|
|
|
+ # Fedora Linux, at least, has the shared version but not the static
|
|
|
|
+ #def library_dirs_for_libffi_a(self):
|
|
|
|
+ # # places where we need to look for libffi.a
|
|
|
|
+ # return self.library_dirs_for_libffi() + ['/usr/lib']
|
|
|
|
|
|
|
|
|
|
|
|
class Linux64(BaseLinux):
|