Commit 105c1abe authored by Jason Madden's avatar Jason Madden

Changelog and comment for #616. Fixes #616. Fixes #381.

parent b8c5a192
...@@ -79,6 +79,9 @@ Unreleased ...@@ -79,6 +79,9 @@ Unreleased
(The same thing could happen under Python 2 if a ``threading.RLock`` (The same thing could happen under Python 2 if a ``threading.RLock``
was held around the monkey-patching call; this is less likely but was held around the monkey-patching call; this is less likely but
not impossible with import hooks.) not impossible with import hooks.)
- Fix configuring c-ares for a 32-bit Python when running on a 64-bit
platform. Reported in :issue:`381` and fixed in :pr:`616` by Chris
Lane.
1.1a2 (Jul 8, 2015) 1.1a2 (Jul 8, 2015)
=================== ===================
......
#!/usr/bin/env python
"""gevent build & installation script"""
from __future__ import print_function from __future__ import print_function
import sys import sys
import os import os
...@@ -67,6 +69,7 @@ libev_configure_command = ' '.join(["(cd ", _quoted_abspath('libev/'), ...@@ -67,6 +69,7 @@ libev_configure_command = ' '.join(["(cd ", _quoted_abspath('libev/'),
" && mv config.h \"$OLDPWD\")", " && mv config.h \"$OLDPWD\")",
'> configure-output.txt']) '> configure-output.txt'])
# See #616, trouble building for a 32-bit python against a 64-bit platform
_config_vars = distutils.sysconfig.get_config_var("CFLAGS") _config_vars = distutils.sysconfig.get_config_var("CFLAGS")
if _config_vars and "m32" in _config_vars: if _config_vars and "m32" in _config_vars:
_m32 = 'CFLAGS="' + os.getenv('CFLAGS', '') + ' -m32"' _m32 = 'CFLAGS="' + os.getenv('CFLAGS', '') + ' -m32"'
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment