From cdd8ec7b9581c746f83528b70be94405bfffd1ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20Wasserb=C3=A4ch?= Date: Sun, 16 Jan 2011 18:33:22 +0100 Subject: [PATCH] debian/patches/FindBoost_add_-lpthread_#563479.diff: Added. (Closes: #563479) --- debian/changelog | 2 ++ .../FindBoost_add_-lpthread_#563479.diff | 23 +++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 26 insertions(+) create mode 100644 debian/patches/FindBoost_add_-lpthread_#563479.diff diff --git a/debian/changelog b/debian/changelog index ed31d160c..bf9425610 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,8 @@ cmake (2.8.4~rc1-1) UNRELEASED; urgency=low + FindTCL_fix_#600245.diff + FindPython_fix_#569321_and_#580503.diff (Please note, that upstream's solution is slightly different from what Debian had initially!) + * debian/patches/FindBoost_add_-lpthread_#563479.diff: Added. + (Closes: #563479) -- Kai Wasserbäch Sun, 16 Jan 2011 11:40:34 +0100 diff --git a/debian/patches/FindBoost_add_-lpthread_#563479.diff b/debian/patches/FindBoost_add_-lpthread_#563479.diff new file mode 100644 index 000000000..f00e1e3fb --- /dev/null +++ b/debian/patches/FindBoost_add_-lpthread_#563479.diff @@ -0,0 +1,23 @@ +Subject: Add -lpthread when using Boost::Thread. +Author: Kai Wasserbäch +Origin: vendor +Last-Update: 2011-01-16 +Bug: http://public.kitware.com/Bug/view.php?id=10692 +Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=563479 +Forwarded: no +--- + Modules/FindBoost.cmake | 3 +++ + 1 file changed, 3 insertions(+) + +--- a/Modules/FindBoost.cmake ++++ b/Modules/FindBoost.cmake +@@ -1121,6 +1121,9 @@ else(_boost_IN_CACHE) + message (STATUS " ${COMPONENT}") + endif(NOT Boost_FIND_QUIETLY) + set(Boost_LIBRARIES ${Boost_LIBRARIES} ${Boost_${UPPERCOMPONENT}_LIBRARY}) ++ if(${UPPERCOMPONENT} STREQUAL "THREAD" AND UNIX) ++ set(Boost_LIBRARIES ${Boost_LIBRARIES} pthread) ++ endif(${UPPERCOMPONENT} STREQUAL "THREAD" AND UNIX) + endif( Boost_${UPPERCOMPONENT}_FOUND ) + endforeach(COMPONENT) + else() diff --git a/debian/patches/series b/debian/patches/series index d671b6a85..8e4365290 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ fixup_manpages.diff +FindBoost_add_-lpthread_#563479.diff