SOURCES: python30-no_ndbm.patch - updated for 3.0.1

[wiget]

Author: wiget                        Date: Sat Feb 21 19:53:00 2009 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated for 3.0.1

---- Files affected:
SOURCES:
   python30-no_ndbm.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/python30-no_ndbm.patch
diff -u SOURCES/python30-no_ndbm.patch:1.1 SOURCES/python30-no_ndbm.patch:1.2
--- SOURCES/python30-no_ndbm.patch:1.1	Sun Sep  2 20:37:47 2007
+++ SOURCES/python30-no_ndbm.patch	Sat Feb 21 20:52:54 2009
@@ -1,33 +1,6 @@
-diff -urN Python-3.0a1.org/Modules/dbmmodule.c Python-3.0a1/Modules/dbmmodule.c
---- Python-3.0a1.org/Modules/dbmmodule.c	2007-08-14 18:29:22.000000000 +0200
-+++ Python-3.0a1/Modules/dbmmodule.c	2007-09-02 20:09:52.356906353 +0200
-@@ -11,22 +11,12 @@
- /* Some Linux systems install gdbm/ndbm.h, but not ndbm.h.  This supports
-  * whichever configure was able to locate.
-  */
--#if defined(HAVE_NDBM_H)
- #include <ndbm.h>
- #if defined(PYOS_OS2) && !defined(PYCC_GCC)
- static char *which_dbm = "ndbm";
- #else
- static char *which_dbm = "GNU gdbm";  /* EMX port of GDBM */
- #endif
--#elif defined(HAVE_GDBM_NDBM_H)
--#include <gdbm/ndbm.h>
--static char *which_dbm = "GNU gdbm";
--#elif defined(HAVE_BERKDB_H)
--#include <db.h>
--static char *which_dbm = "Berkeley DB";
--#else
--#error "No ndbm.h available!"
--#endif
- 
- typedef struct {
- 	PyObject_HEAD
-diff -urN Python-3.0a1.org/setup.py Python-3.0a1/setup.py
---- Python-3.0a1.org/setup.py	2007-08-29 00:24:48.000000000 +0200
-+++ Python-3.0a1/setup.py	2007-09-02 20:09:34.579833964 +0200
-@@ -869,30 +869,8 @@
+--- Python-3.0.1/setup.py.wiget	2009-02-21 20:21:34.000000000 +0100
++++ Python-3.0.1/setup.py	2009-02-21 20:25:49.000000000 +0100
+@@ -776,39 +776,9 @@ class PyBuildExt(build_ext):
  
          # The standard Unix dbm module:
          if platform not in ['cygwin']:
@@ -37,16 +10,25 @@
 -                    ndbm_libs = ['ndbm']
 -                else:
 -                    ndbm_libs = []
--                exts.append( Extension('dbm', ['dbmmodule.c'],
+-                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):
--                exts.append( Extension('dbm', ['dbmmodule.c'],
--                                       define_macros=[('HAVE_GDBM_NDBM_H',None)],
--                                       libraries = ['gdbm'] ) )
+-            elif self.compiler.find_library_file(lib_dirs, 'gdbm'):
+-                gdbm_libs = ['gdbm']
+-                if self.compiler.find_library_file(lib_dirs, 'gdbm_compat'):
+-                    gdbm_libs.append('gdbm_compat')
+-                if find_file("gdbm/ndbm.h", inc_dirs, []) is not None:
+-                    exts.append( Extension(
+-                        '_dbm', ['_dbmmodule.c'],
+-                        define_macros=[('HAVE_GDBM_NDBM_H',None)],
+-                        libraries = gdbm_libs ) )
+-                elif find_file("gdbm-ndbm.h", inc_dirs, []) is not None:
+-                    exts.append( Extension(
+-                        '_dbm', ['_dbmmodule.c'],
+-                        define_macros=[('HAVE_GDBM_DASH_NDBM_H',None)],
+-                        libraries = gdbm_libs ) )
 -            elif db_incs is not None:
--                exts.append( Extension('dbm', ['dbmmodule.c'],
+-                exts.append( Extension('_dbm', ['_dbmmodule.c'],
 -                                       library_dirs=dblib_dir,
 -                                       runtime_library_dirs=dblib_dir,
 -                                       include_dirs=db_incs,
@@ -54,9 +36,10 @@
 -                                                      ('DB_DBM_HSEARCH',None)],
 -                                       libraries=dblibs))
 -            else:
--                missing.append('dbm')
-+            exts.append( Extension('dbm', ['dbmmodule.c'],
-+                                   libraries = ['gdbm', 'gdbm_compat'] ) )
+-                missing.append('_dbm')
++            exts.append( Extension('_dbm', ['_dbmmodule.c'],
++                                   define_macros=[('HAVE_NDBM_H',None)],
++                                   libraries = ["gdbm", "gdbm_compat"] ) )
  
          # Anthony Baxter's gdbm module.  GNU dbm(3) will require -lgdbm:
          if (self.compiler.find_library_file(lib_dirs, 'gdbm')):
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/python30-no_ndbm.patch?r1=1.1&r2=1.2&f=u