diff options
author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-04-14 12:33:07 -0300 |
---|---|---|
committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-04-14 12:33:07 -0300 |
commit | fdd03e5ecce11853fa939682ed87e938605d36be (patch) | |
tree | d48893d7d8ce37d16a2368194969880050357df7 /testing/python2/python-2.7-db51.diff | |
parent | 1fafdadaae260eaef7194102b5eb842466e63dd1 (diff) | |
parent | 0917a0682e48c4261e47d743725d990f47f6ec95 (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/autocutsel/PKGBUILD
community/dev86/PKGBUILD
testing/gnome-control-center/PKGBUILD
Diffstat (limited to 'testing/python2/python-2.7-db51.diff')
-rw-r--r-- | testing/python2/python-2.7-db51.diff | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/testing/python2/python-2.7-db51.diff b/testing/python2/python-2.7-db51.diff new file mode 100644 index 000000000..2da95c375 --- /dev/null +++ b/testing/python2/python-2.7-db51.diff @@ -0,0 +1,42 @@ +diff -Naur Python-2.7-orig//Modules/_bsddb.c Python-2.7/Modules/_bsddb.c +--- Python-2.7-orig//Modules/_bsddb.c 2010-05-10 00:46:46.000000000 +1000 ++++ Python-2.7/Modules/_bsddb.c 2010-10-20 13:19:26.436669911 +1000 +@@ -9765,8 +9765,11 @@ + + ADD_INT(d, DB_REP_PERMANENT); + +-#if (DBVER >= 44) ++#if (DBVER >= 44) && (DBVER <= 48) + ADD_INT(d, DB_REP_CONF_NOAUTOINIT); ++#endif ++ ++#if (DBVER >= 44) + ADD_INT(d, DB_REP_CONF_DELAYCLIENT); + ADD_INT(d, DB_REP_CONF_BULK); + ADD_INT(d, DB_REP_CONF_NOWAIT); +diff -Naur Python-2.7-orig//setup.py Python-2.7/setup.py +--- Python-2.7-orig//setup.py 2010-06-27 22:36:16.000000000 +1000 ++++ Python-2.7/setup.py 2010-10-20 13:10:48.256670026 +1000 +@@ -765,7 +765,7 @@ + # a release. Most open source OSes come with one or more + # versions of BerkeleyDB already installed. + +- max_db_ver = (4, 8) ++ max_db_ver = (5, 1) + min_db_ver = (4, 1) + db_setup_debug = False # verbose debug prints from this script? + +@@ -787,8 +787,12 @@ + return True + + def gen_db_minor_ver_nums(major): +- if major == 4: ++ if major == 5: + for x in range(max_db_ver[1]+1): ++ if allow_db_ver((5, x)): ++ yield x ++ if major == 4: ++ for x in range(9): + if allow_db_ver((4, x)): + yield x + elif major == 3: |