SOURCES: python-no_ndbm.patch - updated for python 2.6.2

wrobell wrobell at pld-linux.org
Wed Apr 15 22:34:40 CEST 2009


Author: wrobell                      Date: Wed Apr 15 20:34:40 2009 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated for python 2.6.2

---- Files affected:
SOURCES:
   python-no_ndbm.patch (1.5 -> 1.6) 

---- Diffs:

================================================================
Index: SOURCES/python-no_ndbm.patch
diff -u SOURCES/python-no_ndbm.patch:1.5 SOURCES/python-no_ndbm.patch:1.6
--- SOURCES/python-no_ndbm.patch:1.5	Fri Oct  3 10:13:48 2008
+++ SOURCES/python-no_ndbm.patch	Wed Apr 15 22:34:35 2009
@@ -1,6 +1,36 @@
---- Python-2.3/setup.py	Thu Jul 10 12:48:39 2003
-+++ Python-2.3.new/setup.py	Thu Aug 28 15:02:31 2003
-@@ -1007,31 +1007,8 @@
+diff -Nur Python-2.6.2.orig/Modules/dbmmodule.c Python-2.6.2/Modules/dbmmodule.c
+--- Python-2.6.2.orig/Modules/dbmmodule.c	2008-12-06 17:39:54.000000000 +0000
++++ Python-2.6.2/Modules/dbmmodule.c	2009-04-15 21:29:38.000000000 +0100
+@@ -11,25 +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_GDBM_DASH_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 -Nur Python-2.6.2.orig/setup.py Python-2.6.2/setup.py
+--- Python-2.6.2.orig/setup.py	2009-03-31 19:20:48.000000000 +0100
++++ Python-2.6.2/setup.py	2009-04-15 21:28:11.000000000 +0100
+@@ -1010,42 +1010,8 @@
              missing.append('bsddb185')
  
          # The standard Unix dbm module:
@@ -14,11 +44,22 @@
 -                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 ) )
+-                else:
+-                    missing.append('dbm')
 -            elif db_incs is not None:
 -                exts.append( Extension('dbm', ['dbmmodule.c'],
 -                                       library_dirs=dblib_dir,
@@ -34,28 +75,3 @@
  
          # Anthony Baxter's gdbm module.  GNU dbm(3) will require -lgdbm:
          if (self.compiler.find_library_file(lib_dirs, 'gdbm')):
---- Python-2.3/Modules/dbmmodule.c	Fri Nov 22 23:29:31 2002
-+++ Python-2.3.new/Modules/dbmmodule.c	Thu Aug 28 14:51:48 2003
-@@ -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
================================================================

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



More information about the pld-cvs-commit mailing list