Author: Amaury Forgeot d'Arc <[email protected]>
Branch: py3.3
Changeset: r75235:4e2ba5029f10
Date: 2015-01-04 21:20 +0100
http://bitbucket.org/pypy/pypy/changeset/4e2ba5029f10/
Log: in release.py, import lzma instead of _lzma because of an import
loop (distutils imports zip which imports lzma). + Rename the .so
built by _lzma.py
diff --git a/lib_pypy/_lzma.py b/lib_pypy/_lzma.py
--- a/lib_pypy/_lzma.py
+++ b/lib_pypy/_lzma.py
@@ -3,6 +3,7 @@
# PyPy changes:
# - added __getstate__() methods that raise TypeError on pickling.
+# - in ffi.verify(), changed modulename to '_lzmaffi'.
from cffi import FFI
import threading
@@ -296,7 +297,7 @@
include_dirs=['/opt/local/include', '/usr/local/include'],
library_dirs=['/opt/local/include', '/usr/local/include'],
ext_package='_lzmaffi_mods',
- modulename='_compiled_module')
+ modulename='_lzmaffi')
def _new_lzma_stream():
ret = ffi.new('lzma_stream*')
diff --git a/pypy/tool/release/package.py b/pypy/tool/release/package.py
--- a/pypy/tool/release/package.py
+++ b/pypy/tool/release/package.py
@@ -111,7 +111,7 @@
'''
def create_cffi_import_libraries(pypy_c, options):
- modules = ['_sqlite3', '_lzma', 'audioop']
+ modules = ['_sqlite3', 'lzma', 'audioop']
subprocess.check_call([str(pypy_c), '-c', 'import _sqlite3'])
if not sys.platform == 'win32':
modules += ['_curses', 'syslog', '_gdbm', '_sqlite3']
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
