From: Matthias Klose <doko@ubuntu.com>
Date: Tue, 7 Apr 2009 16:11:56 +0000 (+0000)
Subject: Merged revisions 71368 via svnmerge from
X-Git-Tag: 3.0~251
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cadb4dc414edb78ff1755d4dc50c2416f492c3f0;p=thirdparty%2FPython%2Fcpython.git

Merged revisions 71368 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r71368 | matthias.klose | 2009-04-07 18:08:29 +0200 (Di, 07 Apr 2009) | 4 lines

  Don't check for broken Berkley-DB versions on some platforms; the
  test was required for the _bsddb3 extension, not necessary for the
  _dbm extension.
........
---

diff --git a/setup.py b/setup.py
index 43e3758fbf63..8fa61c6cd78b 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,6 @@ __version__ = "$Revision$"
 
 import sys, os, imp, re, optparse
 from glob import glob
-from platform import machine as platform_machine
 
 from distutils import log
 from distutils import sysconfig
@@ -686,13 +685,6 @@ class PyBuildExt(build_ext):
             """
             if not (min_db_ver <= db_ver <= max_db_ver):
                 return False
-            # Use this function to filter out known bad configurations.
-            if (4, 6) == db_ver[:2]:
-                # BerkeleyDB 4.6.x is not stable on many architectures.
-                arch = platform_machine()
-                if arch not in ('i386', 'i486', 'i586', 'i686',
-                                'x86_64', 'ia64'):
-                    return False
             return True
 
         def gen_db_minor_ver_nums(major):