diff options
| author | David Tardon <dtardon@redhat.com> | 2011-01-25 17:56:51 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2011-01-25 17:58:31 +0100 |
| commit | ad24601ea82fea03a4a414acf7732dee5ecc402a (patch) | |
| tree | bf2f8528c27f15fbb6d20a309ac31fbed57ee440 /cppunit | |
| parent | c094e38abafde5a6f46eb8523e25bad70bb5ef33 (diff) | |
rhbz#641350 don't segfault when test is built with debug. STL
Diffstat (limited to 'cppunit')
| -rw-r--r-- | cppunit/avoid-synthetised-destructor.patch | 29 | ||||
| -rw-r--r-- | cppunit/makefile.mk | 2 |
2 files changed, 30 insertions, 1 deletions
diff --git a/cppunit/avoid-synthetised-destructor.patch b/cppunit/avoid-synthetised-destructor.patch new file mode 100644 index 000000000000..9ef747688c8f --- /dev/null +++ b/cppunit/avoid-synthetised-destructor.patch @@ -0,0 +1,29 @@ +rhbz#641350 impl. destructor of CppUnit::Message causes segfault when test +is built with debug. STL + +diff -up cppunit-1.12.1/include/cppunit/Message.h.dt cppunit-1.12.1/include/cppunit/Message.h +--- cppunit-1.12.1/include/cppunit/Message.h.dt 2010-10-08 14:02:26.514477964 +0200 ++++ cppunit-1.12.1/include/cppunit/Message.h 2010-10-08 14:02:15.411948098 +0200 +@@ -57,6 +57,8 @@ public: + const std::string &detail2, + const std::string &detail3 ); + ++ ~Message(); ++ + Message &operator =( const Message &other ); + + /*! \brief Returns the short description. +diff -up cppunit-1.12.1/src/cppunit/Message.cpp.dt cppunit-1.12.1/src/cppunit/Message.cpp +--- cppunit-1.12.1/src/cppunit/Message.cpp.dt 2010-10-08 14:02:39.421768852 +0200 ++++ cppunit-1.12.1/src/cppunit/Message.cpp 2010-10-08 14:02:54.066829633 +0200 +@@ -47,6 +47,10 @@ Message::Message( const std::string &sho + addDetail( detail1, detail2, detail3 ); + } + ++Message::~Message() ++{ ++} ++ + Message & + Message::operator =( const Message &other ) + { diff --git a/cppunit/makefile.mk b/cppunit/makefile.mk index 26e68450277a..448d905dbb9c 100644 --- a/cppunit/makefile.mk +++ b/cppunit/makefile.mk @@ -34,7 +34,7 @@ TARFILE_MD5=bd30e9cf5523cdfc019b94f5e1d7fd19 # from <https://sourceforge.net/projects/cppunit/files/cppunit/1.12.1/ # cppunit-1.12.1.tar.gz/download> -PATCH_FILES = solarisfinite.patch warnings.patch windows.patch ldflags.patch aix.patch +PATCH_FILES = solarisfinite.patch warnings.patch windows.patch ldflags.patch aix.patch avoid-synthetised-destructor.patch # solarisfinite.patch: see <https://sourceforge.net/tracker/?func=detail& # aid=2912590&group_id=11795&atid=311795> # warnings.patch: see <https://sourceforge.net/tracker/?func=detail& |