cpython: 1a00e04a233d (original) (raw)

Mercurial > cpython

changeset 90381:1a00e04a233d 3.4

- 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. [#15234]

doko@ubuntu.com
date	Thu, 17 Apr 2014 17:52:48 +0200
parents	503bf9dee28e
children	1d1aefd00f07 ca2edbefca35
files	Misc/NEWS setup.py
diffstat	2 files changed, 17 insertions(+), 2 deletions(-)[+] [-] Misc/NEWS 4 setup.py 15

line wrap: on

line diff

--- a/Misc/NEWS +++ b/Misc/NEWS @@ -167,6 +167,10 @@ IDLE Build ----- +- 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. +

Issue #20644: OS X installer build support for documentation build changes in 3.4.1: assume externally supplied sphinx-build is available in /usr/bin.

--- a/setup.py +++ b/setup.py @@ -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][](#l2.7)
       dblibs = [dblib][](#l2.8)

       # Only add the found library and include directories if they aren't[](#l2.9)

       # already being searched. This avoids an explicit runtime library[](#l2.10)

```
       # dependency.[](#l2.11)
```

       if db_incdir in inc_dirs:[](#l2.12)

```
           db_incs = None[](#l2.13)
```
```
       else:[](#l2.14)
```

           db_incs = [db_incdir][](#l2.15)

       if dblib_dir[0] in lib_dirs:[](#l2.16)

           dblib_dir = None[](#l2.17)
   else:[](#l2.18)
       if db_setup_debug: print("db: no appropriate library found")[](#l2.19)
       db_incs = None[](#l2.20)

@@ -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[](#l2.25)

       if sqlite_libdir and sqlite_libdir[0] in lib_dirs:[](#l2.26)

           sqlite_libdir = None[](#l2.27)
       exts.append(Extension('_sqlite3', sqlite_srcs,[](#l2.28)
                             define_macros=sqlite_defines,[](#l2.29)
                             include_dirs=include_dirs,[](#l2.30)

@@ -1202,7 +1213,7 @@ class PyBuildExt(build_ext): libraries = gdbm_libs) break elif cand == "bdb":

               if db_incs is not None:[](#l2.35)

               if dblibs:[](#l2.36)
                   if dbm_setup_debug: print("building dbm using bdb")[](#l2.37)
                   dbmext = Extension('_dbm', ['_dbmmodule.c'],[](#l2.38)
                                      library_dirs=dblib_dir,[](#l2.39)