diff options
author | minskim <minskim> | 2004-03-22 06:33:58 +0000 |
---|---|---|
committer | minskim <minskim> | 2004-03-22 06:33:58 +0000 |
commit | 1c4dc428e9807848df4d448a20a3b56853f62146 (patch) | |
tree | cde324d24d650eb25ac15cd779806ac57c10df0e | |
parent | 48b2e905019ad28de502728e857da7f08417f768 (diff) | |
download | pkgsrc-1c4dc428e9807848df4d448a20a3b56853f62146.tar.gz |
Disable db3 and db4 detection in python23 and python23-pth, so as to
prevent them from picking up a wrong db library on systems that have
native db3 or db4.
-rw-r--r-- | lang/python23-pth/distinfo | 4 | ||||
-rw-r--r-- | lang/python23-pth/patches/patch-am | 30 | ||||
-rw-r--r-- | lang/python23/distinfo | 4 | ||||
-rw-r--r-- | lang/python23/patches/patch-am | 30 |
4 files changed, 42 insertions, 26 deletions
diff --git a/lang/python23-pth/distinfo b/lang/python23-pth/distinfo index 33cf28f3c60..f3bd5c2b8db 100644 --- a/lang/python23-pth/distinfo +++ b/lang/python23-pth/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.11 2004/03/01 00:16:35 recht Exp $ +$NetBSD: distinfo,v 1.12 2004/03/22 06:33:58 minskim Exp $ SHA1 (Python-2.3.3.tgz) = 034d2e3ed011ea753d4fee7efab16e31029b1e5e Size (Python-2.3.3.tgz) = 8491380 bytes @@ -9,4 +9,4 @@ SHA1 (patch-ae) = 544af90b9b7c5eb5cbad0ba0cefa3d9496b5efe3 SHA1 (patch-af) = 2989a1975c8ea435903eafc9add57cb7c4d7de14 SHA1 (patch-ah) = 4bc95e775a2b3f4f1997d0779c561db2e9e7b575 SHA1 (patch-al) = 2dfed1a40493b571e3477cfb56c2d0ed1b1deddf -SHA1 (patch-am) = 669721695a3983638218267ac59f228cd2a8e93d +SHA1 (patch-am) = 74e8d87ecd4cb17634e992a985393c72193b2892 diff --git a/lang/python23-pth/patches/patch-am b/lang/python23-pth/patches/patch-am index 54f2ab2b079..1770cc3a88c 100644 --- a/lang/python23-pth/patches/patch-am +++ b/lang/python23-pth/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:46:26.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 diff --git a/lang/python23/distinfo b/lang/python23/distinfo index da471c54dd1..2618f68b89e 100644 --- a/lang/python23/distinfo +++ b/lang/python23/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.11 2004/03/01 00:16:35 recht Exp $ +$NetBSD: distinfo,v 1.12 2004/03/22 06:33:58 minskim Exp $ SHA1 (Python-2.3.3.tgz) = 034d2e3ed011ea753d4fee7efab16e31029b1e5e Size (Python-2.3.3.tgz) = 8491380 bytes @@ -8,4 +8,4 @@ SHA1 (patch-ae) = 544af90b9b7c5eb5cbad0ba0cefa3d9496b5efe3 SHA1 (patch-af) = 2989a1975c8ea435903eafc9add57cb7c4d7de14 SHA1 (patch-ah) = 4bc95e775a2b3f4f1997d0779c561db2e9e7b575 SHA1 (patch-al) = 30941bb705d216d40d1bbdbaf68d6fb2a4714bd2 -SHA1 (patch-am) = 8580ec64d2d369f4426e30368e10d350aac82c03 +SHA1 (patch-am) = 662ee4d158d4fe059f01c94a5647b00eab69603b 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 |