[pkgsrc/trunk]: pkgsrc/lang/python26 Avoid accessing an unused variable in th...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a7198673f567
branches:  trunk
changeset: 571361:a7198673f567
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Thu Feb 11 15:29:40 2010 +0000

description:
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:

 lang/python26/distinfo         |   4 ++--
 lang/python26/patches/patch-am |  21 ++++++++++++++++++---
 2 files changed, 20 insertions(+), 5 deletions(-)

diffs (60 lines):

diff -r f72ca92f2c87 -r a7198673f567 lang/python26/distinfo
--- a/lang/python26/distinfo    Thu Feb 11 15:17:14 2010 +0000
+++ b/lang/python26/distinfo    Thu Feb 11 15:29:40 2010 +0000
@@ -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-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 -r f72ca92f2c87 -r a7198673f567 lang/python26/patches/patch-am
--- a/lang/python26/patches/patch-am    Thu Feb 11 15:17:14 2010 +0000
+++ b/lang/python26/patches/patch-am    Thu Feb 11 15:29:40 2010 +0000
@@ -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 @@
  
          # 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 @@
          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