diff options
author | Hamish Moffatt <hamish@cloud.net.au> | 2008-10-08 05:02:59 +0000 |
---|---|---|
committer | Hamish Moffatt <hamish@cloud.net.au> | 2008-10-08 05:02:59 +0000 |
commit | 433a26a515a3c3839ba0a9424d18025c9b6019a1 (patch) | |
tree | 96288a55e842b616b2f2e374adaa8e887b522eba /package/python/python-2.4-010-disable_modules_and_ssl.patch | |
parent | 8a12bab608cb8f8ab3d009966c34758d797c7443 (diff) |
Rename patches to include Python 2.4 version, in preparation for adding 2.5
Diffstat (limited to 'package/python/python-2.4-010-disable_modules_and_ssl.patch')
-rw-r--r-- | package/python/python-2.4-010-disable_modules_and_ssl.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/package/python/python-2.4-010-disable_modules_and_ssl.patch b/package/python/python-2.4-010-disable_modules_and_ssl.patch new file mode 100644 index 000000000..a690eae38 --- /dev/null +++ b/package/python/python-2.4-010-disable_modules_and_ssl.patch @@ -0,0 +1,37 @@ +diff -rduNp Python-2.4.2-002/setup.py Python-2.4.2/setup.py +--- Python-2.4.2-002/setup.py 2007-01-22 19:41:47.000000000 +0100 ++++ Python-2.4.2/setup.py 2007-01-22 19:47:25.000000000 +0100 +@@ -15,7 +15,14 @@ from distutils.command.install import in + from distutils.command.install_lib import install_lib + + # This global variable is used to hold the list of modules to be disabled. +-disabled_module_list = [] ++try: ++ disabled_module_list = os.environ["PYTHON_DISABLE_MODULES"].split() ++except KeyError: ++ disabled_module_list = [] ++try: ++ disable_ssl = os.environ["PYTHON_DISABLE_SSL"] ++except KeyError: ++ disable_ssl = 0 + + def add_dir_to_list(dirlist, dir): + """Add the directory 'dir' to the list 'dirlist' (at the front) if +@@ -247,6 +254,7 @@ class PyBuildExt(build_ext): + return sys.platform + + def detect_modules(self): ++ global disable_ssl + try: + modules_include_dirs = os.environ["PYTHON_MODULES_INCLUDE"].split() + except KeyError: +@@ -468,7 +476,8 @@ class PyBuildExt(build_ext): + ] ) + + if (ssl_incs is not None and +- ssl_libs is not None): ++ ssl_libs is not None and ++ not disable_ssl): + exts.append( Extension('_ssl', ['_ssl.c'], + include_dirs = ssl_incs, + library_dirs = ssl_libs, |