diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2014-06-28 19:22:18 -0400 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2014-06-28 19:31:21 -0400 |
| commit | e23f16d9721397f4edc629f68e1d3a57845fac66 (patch) | |
| tree | 973e82ef53065a48f956cdc7731af082ede6522e | |
| parent | Remove python.eclass-specific 61_all_process_data.patch. (diff) | |
| download | python-gentoo-patches-e23f16d9721397f4edc629f68e1d3a57845fac66.tar.gz python-gentoo-patches-e23f16d9721397f4edc629f68e1d3a57845fac66.tar.bz2 python-gentoo-patches-e23f16d9721397f4edc629f68e1d3a57845fac66.zip | |
| -rw-r--r-- | patches/04_all_non-zero_exit_status_on_failure.patch | 2 | ||||
| -rw-r--r-- | patches/05_all_regenerate_platform-specific_modules.patch | 2 | ||||
| -rw-r--r-- | patches/22_all_tests_environment.patch | 2 | ||||
| -rw-r--r-- | patches/24_all_sqlite-3.8.4.patch | 14 |
4 files changed, 3 insertions, 17 deletions
diff --git a/patches/04_all_non-zero_exit_status_on_failure.patch b/patches/04_all_non-zero_exit_status_on_failure.patch index e8e22bb..995cba1 100644 --- a/patches/04_all_non-zero_exit_status_on_failure.patch +++ b/patches/04_all_non-zero_exit_status_on_failure.patch @@ -21,7 +21,7 @@ http://bugs.python.org/issue6731 failed = self.failed[:] print() print("Failed to build these modules:") -@@ -2219,6 +2223,7 @@ +@@ -2229,6 +2233,7 @@ scripts = ["Tools/scripts/pydoc3", "Tools/scripts/idle3", "Tools/scripts/2to3", "Tools/scripts/pyvenv"] ) diff --git a/patches/05_all_regenerate_platform-specific_modules.patch b/patches/05_all_regenerate_platform-specific_modules.patch index fd86c3c..ab59fc5 100644 --- a/patches/05_all_regenerate_platform-specific_modules.patch +++ b/patches/05_all_regenerate_platform-specific_modules.patch @@ -112,7 +112,7 @@ http://bugs.python.org/issue12619 python-config: $(srcdir)/Misc/python-config.in Misc/python-config.sh # Substitution happens here, as the completely-expanded BINDIR # is not available in configure -@@ -1595,7 +1604,7 @@ +@@ -1596,7 +1605,7 @@ Python/thread.o: @THREADHEADERS@ # Declare targets that aren't real files diff --git a/patches/22_all_tests_environment.patch b/patches/22_all_tests_environment.patch index 3224770..e32e0dd 100644 --- a/patches/22_all_tests_environment.patch +++ b/patches/22_all_tests_environment.patch @@ -2,7 +2,7 @@ http://bugs.python.org/issue1674555 --- Lib/site.py +++ Lib/site.py -@@ -540,8 +540,9 @@ +@@ -545,8 +545,9 @@ known_paths = venv(known_paths) if ENABLE_USER_SITE is None: ENABLE_USER_SITE = check_enableusersite() diff --git a/patches/24_all_sqlite-3.8.4.patch b/patches/24_all_sqlite-3.8.4.patch deleted file mode 100644 index 75ac6ac..0000000 --- a/patches/24_all_sqlite-3.8.4.patch +++ /dev/null @@ -1,14 +0,0 @@ -http://bugs.python.org/issue20901 -http://hg.python.org/cpython/rev/4d626a9df062 - ---- Lib/sqlite3/test/hooks.py -+++ Lib/sqlite3/test/hooks.py -@@ -162,7 +162,7 @@ - create table bar (a, b) - """) - second_count = len(progress_calls) -- self.assertGreater(first_count, second_count) -+ self.assertGreaterEqual(first_count, second_count) - - def CheckCancelOperation(self): - """ |