[Python-checkins] cpython (2.7): Issue #15044: Handle Fedora 17's approach to ndbm compatibility (backport from

nick.coghlan python-checkins at python.org
Sun Jun 17 10:35:53 CEST 2012


http://hg.python.org/cpython/rev/4d62f788aa19
changeset:   77483:4d62f788aa19
branch:      2.7
parent:      77474:35d3a8ed7997
user:        Nick Coghlan <ncoghlan at gmail.com>
date:        Sun Jun 17 18:35:39 2012 +1000
summary:
  Issue #15044: Handle Fedora 17's approach to ndbm compatibility (backport from 3.x)

files:
  setup.py |  6 +++++-
  1 files changed, 5 insertions(+), 1 deletions(-)


diff --git a/setup.py b/setup.py
--- a/setup.py
+++ b/setup.py
@@ -1158,10 +1158,14 @@
             for cand in dbm_order:
                 if cand == "ndbm":
                     if find_file("ndbm.h", inc_dirs, []) is not None:
-                        # Some systems have -lndbm, others don't
+                        # Some systems have -lndbm, others have -lgdbm_compat,
+                        # others don't have either
                         if self.compiler.find_library_file(lib_dirs,
                                                                'ndbm'):
                             ndbm_libs = ['ndbm']
+                        elif self.compiler.find_library_file(lib_dirs,
+                                                             'gdbm_compat'):
+                            ndbm_libs = ['gdbm_compat']
                         else:
                             ndbm_libs = []
                         print "building dbm using ndbm"

-- 
Repository URL: http://hg.python.org/cpython


More information about the Python-checkins mailing list