|
@@ -0,0 +1,34 @@
|
|
1
|
+diff --git a/setup.py b/setup.py
|
|
2
|
+index 7868b7b..10ec68f 100644
|
|
3
|
+--- a/setup.py
|
|
4
|
++++ b/setup.py
|
|
5
|
+@@ -1067,6 +1067,7 @@ class PyBuildExt(build_ext):
|
|
6
|
+ if db_setup_debug: print "db lib: ", dblib, "not found"
|
|
7
|
+
|
|
8
|
+ except db_found:
|
|
9
|
++ rt_dblib_dir = None if cross_compiling else dblib_dir
|
|
10
|
+ if db_setup_debug:
|
|
11
|
+ print "bsddb using BerkeleyDB lib:", db_ver, dblib
|
|
12
|
+ print "bsddb lib dir:", dblib_dir, " inc dir:", db_incdir
|
|
13
|
+@@ -1081,7 +1082,7 @@ class PyBuildExt(build_ext):
|
|
14
|
+ exts.append(Extension('_bsddb', ['_bsddb.c'],
|
|
15
|
+ depends = ['bsddb.h'],
|
|
16
|
+ library_dirs=dblib_dir,
|
|
17
|
+- runtime_library_dirs=dblib_dir,
|
|
18
|
++ runtime_library_dirs=rt_dblib_dir,
|
|
19
|
+ include_dirs=db_incs,
|
|
20
|
+ libraries=dblibs))
|
|
21
|
+ else:
|
|
22
|
+@@ -1292,10 +1293,11 @@ class PyBuildExt(build_ext):
|
|
23
|
+ break
|
|
24
|
+ elif cand == "bdb":
|
|
25
|
+ if db_incs is not None:
|
|
26
|
++ rt_dblib_dir = None if cross_compiling else dblib_dir
|
|
27
|
+ print "building dbm using bdb"
|
|
28
|
+ dbmext = Extension('dbm', ['dbmmodule.c'],
|
|
29
|
+ library_dirs=dblib_dir,
|
|
30
|
+- runtime_library_dirs=dblib_dir,
|
|
31
|
++ runtime_library_dirs=rt_dblib_dir,
|
|
32
|
+ include_dirs=db_incs,
|
|
33
|
+ define_macros=[
|
|
34
|
+ ('HAVE_BERKDB_H', None),
|