diff options
Diffstat (limited to 'lang/python24')
| -rw-r--r-- | lang/python24/distinfo | 4 | ||||
| -rw-r--r-- | lang/python24/patches/patch-am | 28 |
2 files changed, 22 insertions, 10 deletions
diff --git a/lang/python24/distinfo b/lang/python24/distinfo index 8b34ed4f229..ba4e5edee73 100644 --- a/lang/python24/distinfo +++ b/lang/python24/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.35 2011/09/14 17:00:20 hans Exp $ +$NetBSD: distinfo,v 1.36 2011/10/18 21:59:17 sbd Exp $ SHA1 (Python-2.4.6.tar.bz2) = cb1972a554a458f6a26d3e047b359251865d7c96 RMD160 (Python-2.4.6.tar.bz2) = 0687989193dec2ac108142759281be7ddcf7f31e @@ -15,7 +15,7 @@ SHA1 (patch-ai) = 6435c5a7269c14d94eab6fb9777b9d059507e7b8 SHA1 (patch-aj) = e471737ade95423039661b475f2dd0fc27aa9dac SHA1 (patch-ak) = 4c6708eb29757179e6855d8fbe78cab92c5a18d5 SHA1 (patch-al) = 3bcbdcacc451c8a354ea2d9e9887e61edaabfa41 -SHA1 (patch-am) = 31158eee32363963e2f6d0bd528f0b291453de74 +SHA1 (patch-am) = 3db16b0d139c9ae113378aeb94a4cdf9828148ce SHA1 (patch-an) = 0ae5b3d547c7dbe1366c5ae6c60c11516e4550b8 SHA1 (patch-ao) = 1ef48142acd8b591b11013b46048d9145f235843 SHA1 (patch-ap) = 8fbfecdb80ee851db569b64201ccd94bd3552a81 diff --git a/lang/python24/patches/patch-am b/lang/python24/patches/patch-am index ca5559e75c2..e2e4671bea4 100644 --- a/lang/python24/patches/patch-am +++ b/lang/python24/patches/patch-am @@ -1,4 +1,4 @@ -$NetBSD: patch-am,v 1.6 2009/09/19 09:30:41 obache Exp $ +$NetBSD: patch-am,v 1.7 2011/10/18 21:59:17 sbd Exp $ --- setup.py.orig 2006-10-08 17:41:25.000000000 +0000 +++ setup.py @@ -261,25 +261,37 @@ $NetBSD: patch-am,v 1.6 2009/09/19 09:30:41 obache Exp $ # The standard Unix dbm module: if platform not in ['cygwin']: -@@ -689,11 +574,13 @@ - exts.append( Extension('dbm', ['dbmmodule.c'], +@@ -686,16 +571,21 @@ + ndbm_libs = ['ndbm'] + else: + ndbm_libs = [] +- exts.append( Extension('dbm', ['dbmmodule.c'], ++ if not self.compiler.find_library_file(lib_dirs, 'gdbm_compat'): ++ exts.append( Extension('dbm', ['dbmmodule.c'], define_macros=[('HAVE_NDBM_H',None)], libraries = ndbm_libs ) ) - elif (self.compiler.find_library_file(lib_dirs, 'gdbm') - and find_file("gdbm/ndbm.h", inc_dirs, []) is not None): -+ elif find_file("ndbm.h", db_incs, []) is not None: - exts.append( Extension('dbm', ['dbmmodule.c'], +- exts.append( Extension('dbm', ['dbmmodule.c'], - define_macros=[('HAVE_GDBM_NDBM_H',None)], - libraries = ['gdbm'] ) ) +- elif db_incs is not None: +- exts.append( Extension('dbm', ['dbmmodule.c'], ++ ++ if not module_enabled(exts, 'dbm'): ++ if find_file("ndbm.h", db_incs, []) is not None: ++ exts.append( Extension('dbm', ['dbmmodule.c'], + library_dirs=dblib_dir, + runtime_library_dirs=dblib_dir, + include_dirs=db_incs, + define_macros=[('HAVE_NDBM_H',None)], + libraries=dblibs)) - elif db_incs is not None: - exts.append( Extension('dbm', ['dbmmodule.c'], ++ elif db_incs is not None: ++ exts.append( Extension('dbm', ['dbmmodule.c'], library_dirs=dblib_dir, -@@ -1224,8 +1111,8 @@ + runtime_library_dirs=dblib_dir, + include_dirs=db_incs, +@@ -1224,8 +1114,8 @@ ext_modules=[Extension('struct', ['structmodule.c'])], # Scripts to install |