From 2ee1e7cda1d1119cccc28611d0210d21d8358b66 Mon Sep 17 00:00:00 2001 From: Jean-Paul Calderone Date: Wed, 31 Dec 2008 14:58:38 -0500 Subject: make sure to handle r2i extensions (like proxyCertInfo) without segfaulting --- setup.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 1ebba4f..0bc6580 100755 --- a/setup.py +++ b/setup.py @@ -72,7 +72,8 @@ def mkExtension(name): dep = globals()[name.lower() + '_dep'] return Extension(modname, src, libraries=Libraries, depends=dep, include_dirs=IncludeDirs, library_dirs=LibraryDirs, - extra_objects=ExtraObjects) + extra_objects=ExtraObjects, + extra_compile_args=["-O0"]) setup(name='pyOpenSSL', version=__version__, package_dir = {'OpenSSL': '.'}, -- cgit v1.2.1 From a1a7801a0c0d72333928dfee362854830efa49f8 Mon Sep 17 00:00:00 2001 From: Jean-Paul Calderone Date: Wed, 31 Dec 2008 15:09:33 -0500 Subject: Remove unintentionally added debug helper --- setup.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 0bc6580..1ebba4f 100755 --- a/setup.py +++ b/setup.py @@ -72,8 +72,7 @@ def mkExtension(name): dep = globals()[name.lower() + '_dep'] return Extension(modname, src, libraries=Libraries, depends=dep, include_dirs=IncludeDirs, library_dirs=LibraryDirs, - extra_objects=ExtraObjects, - extra_compile_args=["-O0"]) + extra_objects=ExtraObjects) setup(name='pyOpenSSL', version=__version__, package_dir = {'OpenSSL': '.'}, -- cgit v1.2.1 From 3ea41b021528a3e45ebb966a9211e4dddb33aafb Mon Sep 17 00:00:00 2001 From: Jean-Paul Calderone Date: Wed, 31 Dec 2008 15:15:29 -0500 Subject: Try to find ssleay32.a in more locations, including on that may be a bit more common windows --- setup.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 1ebba4f..cba05e7 100755 --- a/setup.py +++ b/setup.py @@ -57,7 +57,13 @@ LibraryDirs = None # Add more platforms here when needed if os.name == 'nt' or sys.platform == 'win32': Libraries = ['eay32', 'Ws2_32'] - ExtraObjects = [r"c:\Python25\libs\ssleay32.a"] + # Try to find it... + for path in ["c:/Python25/libs/", "C:/Python26/libs/", "C:/OpenSSL/lib/MinGW/"]: + if os.path.exists(os.path.join(path, "ssleay32.a")): + ExtraObjects = [os.path.join(path, "ssleay32.a")] + break + else: + raise SystemExit("Cannot find ssleay32.a, aborting") else: Libraries = ['ssl', 'crypto'] ExtraObjects = [] -- cgit v1.2.1