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/python27 | |
| 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/python27')
| -rw-r--r-- | lang/python27/distinfo | 4 | ||||
| -rw-r--r-- | lang/python27/patches/patch-am | 30 |
2 files changed, 28 insertions, 6 deletions
diff --git a/lang/python27/distinfo b/lang/python27/distinfo index 63789d81c7e..2aa816cb998 100644 --- a/lang/python27/distinfo +++ b/lang/python27/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.9 2011/09/30 08:37:24 yyamano Exp $ +$NetBSD: distinfo,v 1.10 2011/10/18 21:59:18 sbd Exp $ SHA1 (Python-2.7.2.tar.bz2) = 417bdeea77abfaf1b9257fc6b4a04aaa209f4547 RMD160 (Python-2.7.2.tar.bz2) = c3bf4f09b7c429a4d9f4cc251c795304cd5232c5 @@ -12,7 +12,7 @@ SHA1 (patch-ad) = de730b9f5a5efb56afa8bed05824b5f6579242ec SHA1 (patch-ae) = ff6d8c6164fe3c6dc4fb33d88eb8a49d5c5442f6 SHA1 (patch-ah) = 8e9ee44c7a054f1387b6d8ef8dbe9c1b8dc8d891 SHA1 (patch-al) = b97c2e73b9038e22f55ec226c2cbcc671466ad19 -SHA1 (patch-am) = 8b546a0eb9b5e6d287b6fead2d0c20fd457b5b66 +SHA1 (patch-am) = 593f14d9f4ad9f46c57cc43a2a6402ffb9312437 SHA1 (patch-an) = 6098fbf0fc31422196cc40d3a227934523db11ca SHA1 (patch-ao) = 9996a444fc0034c9f01fd18f4ad7bf714a8c8d04 SHA1 (patch-au) = 18fce68df48e43c2927cc83e6b4b404b5e1103b7 diff --git a/lang/python27/patches/patch-am b/lang/python27/patches/patch-am index 5163f520b34..0b341b9060b 100644 --- a/lang/python27/patches/patch-am +++ b/lang/python27/patches/patch-am @@ -1,4 +1,4 @@ -$NetBSD: patch-am,v 1.3 2011/06/13 11:31:13 obache Exp $ +$NetBSD: patch-am,v 1.4 2011/10/18 21:59:18 sbd Exp $ Disabled modules for normal build: bsddb @@ -270,10 +270,30 @@ Build the 1.85 compat module all the time against the BDB version of choice. dbm_order = ['gdbm'] # The standard Unix dbm module: -@@ -1193,18 +1012,14 @@ class PyBuildExt(build_ext): +@@ -1160,13 +979,15 @@ class PyBuildExt(build_ext): + ndbm_libs = ['ndbm'] + else: + ndbm_libs = [] +- print "building dbm using ndbm" +- dbmext = Extension('dbm', ['dbmmodule.c'], ++ if not self.compiler.find_library_file(lib_dirs, ++ 'gdbm'): ++ print "building dbm using ndbm" ++ dbmext = Extension('dbm', ['dbmmodule.c'], + define_macros=[ + ('HAVE_NDBM_H',None), + ], + libraries=ndbm_libs) +- break ++ break + + elif cand == "gdbm": + if self.compiler.find_library_file(lib_dirs, 'gdbm'): +@@ -1192,19 +1013,16 @@ class PyBuildExt(build_ext): + ], libraries = gdbm_libs) break - elif cand == "bdb": +- elif cand == "bdb": - if db_incs is not None: - print "building dbm using bdb" - dbmext = Extension('dbm', ['dbmmodule.c'], @@ -286,6 +306,8 @@ Build the 1.85 compat module all the time against the BDB version of choice. - ], - libraries=dblibs) - break ++ ++ if cand == "bdb" and dbmext is None: + print "building dbm using bdb" + dbmext = Extension('dbm', ['dbmmodule.c'], + define_macros=[ @@ -297,7 +319,7 @@ Build the 1.85 compat module all the time against the BDB version of choice. if dbmext is not None: exts.append(dbmext) else: -@@ -2066,9 +1881,9 @@ def main(): +@@ -2066,9 +1884,9 @@ def main(): ext_modules=[Extension('_struct', ['_struct.c'])], # Scripts to install |