Author: Maciej Fijalkowski <fij...@gmail.com>
Branch:
Changeset: r63961:cd7048f853a6
Date: 2013-05-10 14:18 +0200
http://bitbucket.org/pypy/pypy/changeset/cd7048f853a6/
Log: merge
diff --git a/lib-python/2.7/distutils/sysconfig_pypy.py
b/lib-python/2.7/distutils/sysconfig_pypy.py
--- a/lib-python/2.7/distutils/sysconfig_pypy.py
+++ b/lib-python/2.7/distutils/sysconfig_pypy.py
@@ -122,10 +122,10 @@
compiler.compiler_so.extend(['-fPIC', '-Wimplicit'])
compiler.shared_lib_extension = get_config_var('SO')
if "CFLAGS" in os.environ:
- cflags = os.environ["CFLAGS"]
- compiler.compiler.append(cflags)
- compiler.compiler_so.append(cflags)
- compiler.linker_so.append(cflags)
+ cflags = os.environ["CFLAGS"].split()
+ compiler.compiler.extend(cflags)
+ compiler.compiler_so.extend(cflags)
+ compiler.linker_so.extend(cflags)
from sysconfig_cpython import (
diff --git a/pypy/module/cpyext/include/patchlevel.h
b/pypy/module/cpyext/include/patchlevel.h
--- a/pypy/module/cpyext/include/patchlevel.h
+++ b/pypy/module/cpyext/include/patchlevel.h
@@ -29,7 +29,7 @@
#define PY_VERSION "2.7.3"
/* PyPy version as a string */
-#define PYPY_VERSION "2.0.0-beta2"
+#define PYPY_VERSION "2.1.0-alpha0"
/* Subversion Revision number of this file (not of the repository).
* Empty since Mercurial migration. */
diff --git a/pypy/module/sys/version.py b/pypy/module/sys/version.py
--- a/pypy/module/sys/version.py
+++ b/pypy/module/sys/version.py
@@ -11,7 +11,7 @@
#XXX # sync CPYTHON_VERSION with patchlevel.h, package.py
CPYTHON_API_VERSION = 1013 #XXX # sync with include/modsupport.h
-PYPY_VERSION = (2, 0, 0, "beta", 2) #XXX # sync patchlevel.h
+PYPY_VERSION = (2, 1, 0, "alpha", 0) #XXX # sync patchlevel.h
if platform.name == 'msvc':
COMPILER_INFO = 'MSC v.%d 32 bit' % (platform.version * 10 + 600)
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
