diff options
Diffstat (limited to 'lang/python23/patches/patch-am')
| -rw-r--r-- | lang/python23/patches/patch-am | 30 |
1 files changed, 19 insertions, 11 deletions
diff --git a/lang/python23/patches/patch-am b/lang/python23/patches/patch-am index 24bcc341afa..fdc5c471360 100644 --- a/lang/python23/patches/patch-am +++ b/lang/python23/patches/patch-am @@ -1,8 +1,8 @@ -$NetBSD: patch-am,v 1.3 2003/12/23 17:24:42 recht Exp $ +$NetBSD: patch-am,v 1.4 2004/03/22 06:33:58 minskim Exp $ ---- setup.py.orig 2003-10-21 22:01:21.000000000 +0200 -+++ setup.py 2003-12-23 12:43:32.000000000 +0100 -@@ -15,7 +15,7 @@ +--- setup.py.orig 2003-10-21 15:01:21.000000000 -0500 ++++ setup.py +@@ -15,7 +15,7 @@ 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. @@ -11,7 +11,7 @@ $NetBSD: patch-am,v 1.3 2003/12/23 17:24:42 recht Exp $ def add_dir_to_list(dirlist, dir): """Add the directory 'dir' to the list 'dirlist' (at the front) if -@@ -240,9 +240,15 @@ +@@ -240,9 +240,15 @@ class PyBuildExt(build_ext): return sys.platform def detect_modules(self): @@ -30,7 +30,7 @@ $NetBSD: patch-am,v 1.3 2003/12/23 17:24:42 recht Exp $ # fink installs lots of goodies in /sw/... - make sure we # check there -@@ -436,9 +442,7 @@ +@@ -436,9 +442,7 @@ class PyBuildExt(build_ext): depends = ['socketmodule.h']) ) # Detect SSL support for the socket module (via _ssl) ssl_incs = find_file('openssl/ssl.h', inc_dirs, @@ -41,7 +41,7 @@ $NetBSD: patch-am,v 1.3 2003/12/23 17:24:42 recht Exp $ ) if ssl_incs is not None: krb5_h = find_file('krb5.h', inc_dirs, -@@ -446,9 +450,7 @@ +@@ -446,9 +450,7 @@ class PyBuildExt(build_ext): if krb5_h: ssl_incs += krb5_h ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs, @@ -52,7 +52,15 @@ $NetBSD: patch-am,v 1.3 2003/12/23 17:24:42 recht Exp $ if (ssl_incs is not None and ssl_libs is not None): -@@ -562,9 +564,11 @@ +@@ -515,6 +517,7 @@ class PyBuildExt(build_ext): + '/usr/include/db3', + )}, + } ++ db_try_this = {} + + db_search_order = db_try_this.keys() + db_search_order.sort() +@@ -562,9 +565,11 @@ class PyBuildExt(build_ext): include_dirs=db_incs, libraries=dblibs)) else: @@ -67,7 +75,7 @@ $NetBSD: patch-am,v 1.3 2003/12/23 17:24:42 recht Exp $ # Look for Berkeley db 1.85. Note that it is built as a different -@@ -573,21 +577,30 @@ +@@ -573,21 +578,30 @@ class PyBuildExt(build_ext): # accidentally building this module with a later version of the # underlying db library. May BSD-ish Unixes incorporate db 1.85 # symbols into libc and place the include file in /usr/include. @@ -101,7 +109,7 @@ $NetBSD: patch-am,v 1.3 2003/12/23 17:24:42 recht Exp $ # The standard Unix dbm module: if platform not in ['cygwin']: -@@ -770,7 +783,7 @@ +@@ -770,7 +784,7 @@ class PyBuildExt(build_ext): # Linux-specific modules exts.append( Extension('linuxaudiodev', ['linuxaudiodev.c']) ) @@ -110,7 +118,7 @@ $NetBSD: patch-am,v 1.3 2003/12/23 17:24:42 recht Exp $ exts.append( Extension('ossaudiodev', ['ossaudiodev.c']) ) if platform == 'sunos5': -@@ -1140,7 +1153,7 @@ +@@ -1140,7 +1154,7 @@ def main(): ext_modules=[Extension('struct', ['structmodule.c'])], # Scripts to install |