Author: Brian Kearns <[email protected]>
Branch:
Changeset: r70033:56b6b496d480
Date: 2014-03-17 17:44 -0400
http://bitbucket.org/pypy/pypy/changeset/56b6b496d480/
Log: get libraries from ropenssl
diff --git a/pypy/module/_ssl/test/test_ssl.py
b/pypy/module/_ssl/test/test_ssl.py
--- a/pypy/module/_ssl/test/test_ssl.py
+++ b/pypy/module/_ssl/test/test_ssl.py
@@ -1,5 +1,5 @@
class AppTestSSL:
- spaceconfig = dict(usemodules=('_ssl', '_socket'))
+ spaceconfig = dict(usemodules=('_ssl', '_socket', 'thread'))
def setup_class(cls):
import os
diff --git a/pypy/module/_ssl/thread_lock.py b/pypy/module/_ssl/thread_lock.py
--- a/pypy/module/_ssl/thread_lock.py
+++ b/pypy/module/_ssl/thread_lock.py
@@ -1,7 +1,7 @@
-from rpython.rlib.ropenssl import *
+from rpython.rlib import rthread
+from rpython.rlib.ropenssl import libraries
from rpython.rtyper.lltypesystem import lltype, rffi
from rpython.translator.tool.cbuild import ExternalCompilationInfo
-import sys
# CRYPTO_set_locking_callback:
#
@@ -23,7 +23,6 @@
# without caring about the GIL.
separate_module_source = """
-
#include <openssl/crypto.h>
static unsigned int _ssl_locks_count = 0;
@@ -63,13 +62,6 @@
}
"""
-from rpython.rlib import rthread
-
-libraries = []
-if sys.platform == 'win32':
- # XXX Not needed for mingw32...
- libraries = ['libeay32', 'user32', 'advapi32', 'gdi32']
-
eci = rthread.eci.merge(ExternalCompilationInfo(
separate_module_sources=[separate_module_source],
post_include_bits=[
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
