diff options
| author | joerg <joerg@pkgsrc.org> | 2010-02-11 15:29:40 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2010-02-11 15:29:40 +0000 |
| commit | 04ed6e7601a71d84770a410cfba0acbfd156916c (patch) | |
| tree | 99254587a6ad54213df6ef61f2fd3acfc21bcb5f /lang/python26 | |
| parent | 942294207c41cce86879c82e2c71ec147c860fa3 (diff) | |
| download | pkgsrc-04ed6e7601a71d84770a410cfba0acbfd156916c.tar.gz | |
Avoid accessing an unused variable in the case that no dbm headers are
installed. This case is still not really handled, e.g. the PLIST is
wrong, but at least the build will continue.
Diffstat (limited to 'lang/python26')
| -rw-r--r-- | lang/python26/distinfo | 4 | ||||
| -rw-r--r-- | lang/python26/patches/patch-am | 21 |
2 files changed, 20 insertions, 5 deletions
diff --git a/lang/python26/distinfo b/lang/python26/distinfo index 2648f0126d4..28169493cde 100644 --- a/lang/python26/distinfo +++ b/lang/python26/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.18 2010/01/26 12:15:26 tron Exp $ +$NetBSD: distinfo,v 1.19 2010/02/11 15:29:40 joerg Exp $ SHA1 (Python-2.6.4.tar.bz2) = bee572680d1966501247cb2b26e0e51f94d1cd13 RMD160 (Python-2.6.4.tar.bz2) = fd33853842110fa3636dd296f2f27646fd2b151a @@ -10,7 +10,7 @@ SHA1 (patch-ad) = a997e39d16a8f0023125362b180d19ee97ab519b SHA1 (patch-ae) = 5425515c6bf130eee204ca2749386f6447eaa35b SHA1 (patch-ah) = 98e9fa55c2af38d8032398cae693492c199dc5fa SHA1 (patch-al) = c39144cfa4a540900fac879b5faa990628fcee3e -SHA1 (patch-am) = 952cadccc4cef28da7f297f35a5073dcce38033b +SHA1 (patch-am) = d098417f48f99c036f85b52aaad049262d971e39 SHA1 (patch-an) = 17b4e17b3b562c29a050e9bb20447084ce82b8ab SHA1 (patch-ao) = 9bbd5561c010e0a1ab8e0a70d27a5f77fd2089d2 SHA1 (patch-ap) = 39d81b01fa9e1b894be9ae0922881337bb4d17da diff --git a/lang/python26/patches/patch-am b/lang/python26/patches/patch-am index ba26c937a62..82a05eee132 100644 --- a/lang/python26/patches/patch-am +++ b/lang/python26/patches/patch-am @@ -1,4 +1,4 @@ -$NetBSD: patch-am,v 1.8 2010/01/26 12:15:26 tron Exp $ +$NetBSD: patch-am,v 1.9 2010/02/11 15:29:41 joerg Exp $ Disabled modules for normal build: bsdddb @@ -236,7 +236,22 @@ Build the 1.85 compat module all the time against the BDB version of choice. # The standard Unix dbm module: if platform not in ['cygwin']: -@@ -1300,6 +1146,14 @@ class PyBuildExt(build_ext): +@@ -1036,14 +882,6 @@ class PyBuildExt(build_ext): + libraries = gdbm_libs ) ) + else: + missing.append('dbm') +- elif 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_BERKDB_H',None), +- ('DB_DBM_HSEARCH',None)], +- libraries=dblibs)) + else: + missing.append('dbm') + +@@ -1300,6 +1138,14 @@ class PyBuildExt(build_ext): ) libraries = [] @@ -251,7 +266,7 @@ Build the 1.85 compat module all the time against the BDB version of choice. else: # Linux and other unices macros = dict( HAVE_SEM_OPEN=1, -@@ -1900,9 +1754,9 @@ def main(): +@@ -1900,9 +1746,9 @@ def main(): ext_modules=[Extension('_struct', ['_struct.c'])], # Scripts to install |