diff options
author | doko <doko@ubuntu.com> | 2014-04-17 17:52:48 +0200 |
---|---|---|
committer | doko <doko@ubuntu.com> | 2014-04-17 17:52:48 +0200 |
commit | c4a892b78cb328b866ba3b648b42bbc30b58214e (patch) | |
tree | 7401743864ac498ddc6e47a28e5ee3652c546f36 /setup.py | |
parent | a6db1441bc9edfa6e5812a3409495a068d985414 (diff) | |
download | cpython-c4a892b78cb328b866ba3b648b42bbc30b58214e.tar.gz |
- Issue #15234: For BerkelyDB and Sqlite, only add the found library and
include directories if they aren't already being searched. This avoids
an explicit runtime library dependency.
Diffstat (limited to 'setup.py')
-rw-r--r-- | setup.py | 15 |
1 files changed, 13 insertions, 2 deletions
@@ -1022,8 +1022,16 @@ class PyBuildExt(build_ext): if db_setup_debug: print("bsddb using BerkeleyDB lib:", db_ver, dblib) print("bsddb lib dir:", dblib_dir, " inc dir:", db_incdir) - db_incs = [db_incdir] dblibs = [dblib] + # Only add the found library and include directories if they aren't + # already being searched. This avoids an explicit runtime library + # dependency. + if db_incdir in inc_dirs: + db_incs = None + else: + db_incs = [db_incdir] + if dblib_dir[0] in lib_dirs: + dblib_dir = None else: if db_setup_debug: print("db: no appropriate library found") db_incs = None @@ -1134,6 +1142,9 @@ class PyBuildExt(build_ext): # can end up with a bad search path order. if sqlite_incdir not in self.compiler.include_dirs: include_dirs.append(sqlite_incdir) + # avoid a runtime library path for a system library dir + if sqlite_libdir and sqlite_libdir[0] in lib_dirs: + sqlite_libdir = None exts.append(Extension('_sqlite3', sqlite_srcs, define_macros=sqlite_defines, include_dirs=include_dirs, @@ -1202,7 +1213,7 @@ class PyBuildExt(build_ext): libraries = gdbm_libs) break elif cand == "bdb": - if db_incs is not None: + if dblibs: if dbm_setup_debug: print("building dbm using bdb") dbmext = Extension('_dbm', ['_dbmmodule.c'], library_dirs=dblib_dir, |