author | John Beck <John.Beck@Oracle.COM> |
Thu, 17 Jul 2014 21:06:55 -0700 | |
changeset 2027 | cd5205b6221a |
parent 1954 | 32663e59626d |
child 2028 | 6fa8f5812e20 |
permissions | -rw-r--r-- |
1914 | 1 |
Prior to 2.7.4, the bsddb module was a no-op, as it did not get built. |
2 |
Starting with 2.7.4, the behavior is different, and it causes tests to |
|
3 |
dump core. So skip it. The module is removed in Python 3, so this patch |
|
4 |
is not being submitted upstream. |
|
5 |
||
1954
32663e59626d
19004605 update Python 2.7 line to version 2.7.7
John Beck <John.Beck@Oracle.COM>
parents:
1914
diff
changeset
|
6 |
--- Python-2.7.7/Makefile.pre.in.~4~ 2014-06-02 11:08:40.909703116 -0700 |
32663e59626d
19004605 update Python 2.7 line to version 2.7.7
John Beck <John.Beck@Oracle.COM>
parents:
1914
diff
changeset
|
7 |
+++ Python-2.7.7/Makefile.pre.in 2014-06-02 11:08:40.977964319 -0700 |
32663e59626d
19004605 update Python 2.7 line to version 2.7.7
John Beck <John.Beck@Oracle.COM>
parents:
1914
diff
changeset
|
8 |
@@ -975,7 +975,7 @@ |
1914 | 9 |
email email/mime email/test email/test/data \ |
10 |
json json/tests \ |
|
11 |
sqlite3 sqlite3/test \ |
|
12 |
- logging bsddb bsddb/test csv importlib wsgiref \ |
|
13 |
+ logging csv importlib wsgiref \ |
|
14 |
lib2to3 lib2to3/fixes lib2to3/pgen2 lib2to3/tests \ |
|
15 |
lib2to3/tests/data lib2to3/tests/data/fixers lib2to3/tests/data/fixers/myfixes \ |
|
1954
32663e59626d
19004605 update Python 2.7 line to version 2.7.7
John Beck <John.Beck@Oracle.COM>
parents:
1914
diff
changeset
|
16 |
ctypes ctypes/test ctypes/macholib \ |
1914 | 17 |
--- Python-2.7.6/setup.py.~6~ 2014-05-14 17:15:45.315760008 -0700 |
18 |
+++ Python-2.7.6/setup.py 2014-05-14 17:16:27.440642039 -0700 |
|
19 |
@@ -1065,7 +1065,8 @@ |
|
20 |
db_dirs_to_check + lib_dirs, dblib ) |
|
21 |
if dblib_file: |
|
22 |
dblib_dir = [ os.path.abspath(os.path.dirname(dblib_file)) ] |
|
23 |
- raise db_found |
|
24 |
+ # Doesn't work; skip. |
|
25 |
+ # raise db_found |
|
26 |
else: |
|
27 |
if db_setup_debug: print "db lib: ", dblib, "not found" |
|
28 |