From 721c1efdac18333767c4d2aec7ab33cd44458183 Mon Sep 17 00:00:00 2001 From: David Malcolm Date: Thu, 9 May 2013 12:12:53 -0400 Subject: [PATCH] 3.3.1-4: fix test.test_gdb.PyBtTests.test_threads on ppc64 (rhbz#960010) * Thu May 9 2013 David Malcolm - 3.3.1-4 - fix test.test_gdb.PyBtTests.test_threads on ppc64 (patch 181; rhbz#960010) --- 00181-fix-test_gdb-test_threads.patch | 13 +++++++++++++ python3.spec | 14 +++++++++++++- 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 00181-fix-test_gdb-test_threads.patch diff --git a/00181-fix-test_gdb-test_threads.patch b/00181-fix-test_gdb-test_threads.patch new file mode 100644 index 0000000..41de5b2 --- /dev/null +++ b/00181-fix-test_gdb-test_threads.patch @@ -0,0 +1,13 @@ +diff -up Python-3.3.1/Misc/NEWS.fix-test_gdb-test_threads Python-3.3.1/Misc/NEWS +diff -up Python-3.3.1/Tools/gdb/libpython.py.fix-test_gdb-test_threads Python-3.3.1/Tools/gdb/libpython.py +--- Python-3.3.1/Tools/gdb/libpython.py.fix-test_gdb-test_threads 2013-05-09 12:12:01.621592211 -0400 ++++ Python-3.3.1/Tools/gdb/libpython.py 2013-05-09 12:12:01.632592209 -0400 +@@ -1465,7 +1465,7 @@ class Frame(object): + # This assumes the _POSIX_THREADS version of Python/ceval_gil.h: + name = self._gdbframe.name() + if name: +- return name.startswith('pthread_cond_timedwait') ++ return 'pthread_cond_timedwait' in name + + def is_gc_collect(self): + '''Is this frame "collect" within the garbage-collector?''' diff --git a/python3.spec b/python3.spec index 481e9ca..e66e9bf 100644 --- a/python3.spec +++ b/python3.spec @@ -126,7 +126,7 @@ Summary: Version 3 of the Python programming language aka Python 3000 Name: python3 Version: %{pybasever}.1 -Release: 3%{?dist} +Release: 4%{?dist} License: Python Group: Development/Languages @@ -584,6 +584,14 @@ Patch179: 00179-dont-raise-error-on-gdb-corrupted-frames-in-backtrace.patch # Not appropriate for upstream, Fedora-specific naming Patch180: 00180-python-add-support-for-ppc64p7.patch +# 00181 # +# Fix test.test_gdb.PyBtTests.test_threads on ppc64 +# Cherrypicked from upstream commit: +# http://hg.python.org/cpython/rev/f4a6b731905a/ +# for upstream issue http://bugs.python.org/issue17833 +# (rhbz#960010) +Patch181: 00181-fix-test_gdb-test_threads.patch + # (New patches go here ^^^) # # When adding new patches to "python" and "python3" in Fedora 17 onwards, @@ -837,6 +845,7 @@ done %patch178 -p1 %patch179 -p1 %patch180 -p1 +%patch181 -p1 # Currently (2010-01-15), http://docs.python.org/library is for 2.6, and there # are many differences between 2.6 and the Python 3 library. @@ -1677,6 +1686,9 @@ rm -fr %{buildroot} # ====================================================== %changelog +* Thu May 9 2013 David Malcolm - 3.3.1-4 +- fix test.test_gdb.PyBtTests.test_threads on ppc64 (patch 181; rhbz#960010) + * Thu May 02 2013 Bohuslav Kabrda - 3.3.1-3 - Add patch that enables building on ppc64p7 (replace the sed, so that we get consistent with python2 spec and it's more obvious that we're doing it.