This is an automated email from the git hooks/post-receive script. apo-guest pushed a commit to branch master in repository spring.
commit 6325b2b37c2a2c05d13418b63b949fb34d3968c6 Author: Markus Koschany <a...@gambaru.de> Date: Mon Aug 31 15:57:41 2015 +0200 Add remove-ThreadPool-test.patch. Workaround a FTBFS with GCC 5.2 by removing the ThreadPool test. Closes: #797282 --- debian/patches/remove-ThreadPool-test.patch | 48 +++++++++++++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 49 insertions(+) diff --git a/debian/patches/remove-ThreadPool-test.patch b/debian/patches/remove-ThreadPool-test.patch new file mode 100644 index 0000000..a215755 --- /dev/null +++ b/debian/patches/remove-ThreadPool-test.patch @@ -0,0 +1,48 @@ +From: Markus Koschany <a...@gambaru.de> +Date: Mon, 31 Aug 2015 15:57:02 +0200 +Subject: remove ThreadPool test + +--- + test/CMakeLists.txt | 29 ----------------------------- + 1 file changed, 29 deletions(-) + +diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt +index 18ffcaf..7effc62 100644 +--- a/test/CMakeLists.txt ++++ b/test/CMakeLists.txt +@@ -294,35 +294,6 @@ Else (NOT Boost_FOUND) + add_dependencies(test_${test_name} springcontent.sdz) + + ################################################################################ +-### ThreadPool +- set(test_name ThreadPool) +- Set(test_src +- "${CMAKE_CURRENT_SOURCE_DIR}/engine/System/testThreadPool.cpp" +- "${ENGINE_SOURCE_DIR}/System/ThreadPool.cpp" +- "${ENGINE_SOURCE_DIR}/System/Misc/SpringTime.cpp" +- "${ENGINE_SOURCE_DIR}/System/UnsyncedRNG.cpp" +- "${ENGINE_SOURCE_DIR}/System/Platform/CpuID.cpp" +- "${ENGINE_SOURCE_DIR}/System/Platform/Threading.cpp" +- +- ${test_Log_sources} +- ) +- if(NOT WIN32) +- LIST(APPEND test_src +- "${ENGINE_SOURCE_DIR}/System/Platform/Linux/ThreadSupport.cpp") +- endif() +- set(test_libs +- ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY} +- ${Boost_THREAD_LIBRARY} +- ${Boost_CHRONO_LIBRARY_WITH_RT} +- ${Boost_SYSTEM_LIBRARY} +- ${WINMM_LIBRARY} +- ) +-if(NOT WIN32) +-# FIXME: sometimes fails on windows +- add_spring_test(${test_name} "${test_src}" "${test_libs}" "-DTHREADPOOL -DUNITSYNC") +-endif() +- +-################################################################################ + ### Mutex + set(test_name Mutex) + Set(test_src diff --git a/debian/patches/series b/debian/patches/series index dfb098a..7450922 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ glShaderSource.patch sdl-debian.patch +remove-ThreadPool-test.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/spring.git _______________________________________________ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits