diff options
| author | sbd <sbd@pkgsrc.org> | 2011-10-18 21:59:17 +0000 |
|---|---|---|
| committer | sbd <sbd@pkgsrc.org> | 2011-10-18 21:59:17 +0000 |
| commit | 2661b2647597ca47edf0c8d9d69189f6ad889b06 (patch) | |
| tree | db695d20bf873d0007576a72c81e1870979ba5c1 /lang/python25 | |
| parent | 067045769675bb90f5f5cfe1faf2fafd1681394d (diff) | |
| download | pkgsrc-2661b2647597ca47edf0c8d9d69189f6ad889b06.tar.gz | |
Deal with the fact that if /usr/include/ndbm.h exists on Linux it probably
belongs to gdbm_compat. I.E. _don't_ use ndbm on Linux.
Diffstat (limited to 'lang/python25')
| -rw-r--r-- | lang/python25/distinfo | 4 | ||||
| -rw-r--r-- | lang/python25/patches/patch-am | 21 |
2 files changed, 17 insertions, 8 deletions
diff --git a/lang/python25/distinfo b/lang/python25/distinfo index f24409e4a6b..e06009c62db 100644 --- a/lang/python25/distinfo +++ b/lang/python25/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.17 2011/09/14 17:06:32 hans Exp $ +$NetBSD: distinfo,v 1.18 2011/10/18 21:59:18 sbd Exp $ SHA1 (Python-2.5.6.tar.bz2) = 29f6dd41bf09c5e04311b367cbb7604fa016e699 RMD160 (Python-2.5.6.tar.bz2) = 92f0a955971f187a7d50c6422168202ec551bf22 @@ -15,7 +15,7 @@ SHA1 (patch-ai) = a89bee00860910f53a23b1c670d9c091846a03c1 SHA1 (patch-aj) = a75d680a6b8b1ad3c9222dcb841f4fb10db6d16d SHA1 (patch-ak) = 948362c15ad59abeef46971f9b870b70655a62c7 SHA1 (patch-al) = a4e28f73d8da2f83fcfbb5daec8d7c2c5bb4ff7f -SHA1 (patch-am) = d2e59cbc21542c436f1b1957e6089b4cda21ef8b +SHA1 (patch-am) = ba4a651cc5ab930c9b2abd030d6376110b5d90fa SHA1 (patch-an) = 17b4e17b3b562c29a050e9bb20447084ce82b8ab SHA1 (patch-ao) = 9bbd5561c010e0a1ab8e0a70d27a5f77fd2089d2 SHA1 (patch-ap) = b864db92761c843a91374663bd2dbcfa57b317cf diff --git a/lang/python25/patches/patch-am b/lang/python25/patches/patch-am index 77e72ea2b49..323b3ade935 100644 --- a/lang/python25/patches/patch-am +++ b/lang/python25/patches/patch-am @@ -1,4 +1,4 @@ -$NetBSD: patch-am,v 1.7 2011/06/04 05:08:20 obache Exp $ +$NetBSD: patch-am,v 1.8 2011/10/18 21:59:18 sbd Exp $ --- setup.py.orig 2008-10-16 18:58:19.000000000 +0000 +++ setup.py @@ -350,8 +350,14 @@ $NetBSD: patch-am,v 1.7 2011/06/04 05:08:20 obache Exp $ # The standard Unix dbm module: if platform not in ['cygwin']: -@@ -884,11 +670,6 @@ class PyBuildExt(build_ext): - exts.append( Extension('dbm', ['dbmmodule.c'], +@@ -881,15 +667,13 @@ class PyBuildExt(build_ext): + 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') @@ -359,10 +365,13 @@ $NetBSD: patch-am,v 1.7 2011/06/04 05:08:20 obache Exp $ - exts.append( Extension('dbm', ['dbmmodule.c'], - define_macros=[('HAVE_GDBM_NDBM_H',None)], - libraries = ['gdbm'] ) ) - elif db_incs is not None: +- elif db_incs is not None: ++ ++ if not module_enabled(exts, 'dbm'): exts.append( Extension('dbm', ['dbmmodule.c'], library_dirs=dblib_dir, -@@ -899,9 +680,9 @@ class PyBuildExt(build_ext): + runtime_library_dirs=dblib_dir, +@@ -899,9 +683,9 @@ class PyBuildExt(build_ext): libraries=dblibs)) # Anthony Baxter's gdbm module. GNU dbm(3) will require -lgdbm: @@ -375,7 +384,7 @@ $NetBSD: patch-am,v 1.7 2011/06/04 05:08:20 obache Exp $ # Unix-only modules if platform not in ['mac', 'win32']: -@@ -1536,8 +1317,8 @@ def main(): +@@ -1536,8 +1320,8 @@ def main(): ext_modules=[Extension('_struct', ['_struct.c'])], # Scripts to install |