83b300aa83
Patches already merged and so removed: * 011-fix-ssl-build-use-have-npn.patch * 019-bpo-36216-Add-check-for-characters-in-netloc-that-normalize-to-separators-GH-12216.patch * 020-bpo-36216-Only-print-test-messages-when-verbose-GH-12291.patch * 021-2.7-bpo-35121-prefix-dot-in-domain-for-proper-subdom.patch * 022-bpo-30458-Disallow-control-chars-in-http-URLs-GH-13315.patch * 023-bpo-35907-Avoid-file-reading-as-disallowing-the-unnecessary-URL-scheme-in-urllib-GH-11842.patch * 027-bpo-38243-Escape-the-server-title-of-DocXMLRPCServer.patch * 028-bpo-34155-Dont-parse-domains-containing-GH-13079.patch Patches no longer necessary and so removed: * 017_lib2to3_fix_pyc_search.patch Signed-off-by: Jeffery To <jeffery.to@gmail.com>
32 lines
1.7 KiB
Diff
32 lines
1.7 KiB
Diff
--- a/setup.py
|
|
+++ b/setup.py
|
|
@@ -1129,6 +1129,7 @@ class PyBuildExt(build_ext):
|
|
if db_setup_debug: print "db lib: ", dblib, "not found"
|
|
|
|
except db_found:
|
|
+ rt_dblib_dir = None if cross_compiling else dblib_dir
|
|
if db_setup_debug:
|
|
print "bsddb using BerkeleyDB lib:", db_ver, dblib
|
|
print "bsddb lib dir:", dblib_dir, " inc dir:", db_incdir
|
|
@@ -1143,7 +1144,7 @@ class PyBuildExt(build_ext):
|
|
exts.append(Extension('_bsddb', ['_bsddb.c'],
|
|
depends = ['bsddb.h'],
|
|
library_dirs=dblib_dir,
|
|
- runtime_library_dirs=dblib_dir,
|
|
+ runtime_library_dirs=rt_dblib_dir,
|
|
include_dirs=db_incs,
|
|
libraries=dblibs))
|
|
else:
|
|
@@ -1354,10 +1355,11 @@ class PyBuildExt(build_ext):
|
|
break
|
|
elif cand == "bdb":
|
|
if db_incs is not None:
|
|
+ rt_dblib_dir = None if cross_compiling else dblib_dir
|
|
print "building dbm using bdb"
|
|
dbmext = Extension('dbm', ['dbmmodule.c'],
|
|
library_dirs=dblib_dir,
|
|
- runtime_library_dirs=dblib_dir,
|
|
+ runtime_library_dirs=rt_dblib_dir,
|
|
include_dirs=db_incs,
|
|
define_macros=[
|
|
('HAVE_BERKDB_H', None),
|