From b4a2aa28456687c1eddbf410d5670f7e336b6115 Mon Sep 17 00:00:00 2001 From: Felix Geyer Date: Thu, 29 Nov 2018 20:30:06 +0100 Subject: [PATCH] Drop FindBoost_add_-lpthread_#563479.diff, fixed upstream. --- debian/changelog | 1 + .../FindBoost_add_-lpthread_#563479.diff | 48 ------------------- debian/patches/series | 1 - 3 files changed, 1 insertion(+), 49 deletions(-) delete mode 100644 debian/patches/FindBoost_add_-lpthread_#563479.diff delete mode 100644 debian/patches/series diff --git a/debian/changelog b/debian/changelog index d91fc3891..8fecd0fbb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,7 @@ cmake (3.13.1-1) UNRELEASED; urgency=medium [ Felix Geyer ] * New upstream release. + * Drop FindBoost_add_-lpthread_#563479.diff, fixed upstream. -- Felix Geyer Thu, 29 Nov 2018 20:25:46 +0100 diff --git a/debian/patches/FindBoost_add_-lpthread_#563479.diff b/debian/patches/FindBoost_add_-lpthread_#563479.diff deleted file mode 100644 index 865bdd9d1..000000000 --- a/debian/patches/FindBoost_add_-lpthread_#563479.diff +++ /dev/null @@ -1,48 +0,0 @@ -Subject: Add -lpthread when using Boost::Thread. -Author: Philip Lowman -Author: Modestas Vainius -Origin: other, http://public.kitware.com/Bug/file_download.php?file_id=3929&type=bug -Last-Update: 2013-03-16 -Bug: http://cmake.org/Bug/view.php?id=10692 -Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=563479 -Forwarded: http://cmake.org/Bug/file_download.php?file_id=3629&type=bug - ---- - Modules/FindBoost.cmake | 19 +++++++++++++++++++ - 1 file changed, 19 insertions(+) - ---- a/Modules/FindBoost.cmake -+++ b/Modules/FindBoost.cmake -@@ -861,6 +861,22 @@ function(_Boost_MISSING_DEPENDENCIES com - endif() - endfunction() - -+function(_Boost_consider_adding_pthreads _outvar) -+ # On Unix platforms (excluding cygwin) add pthreads to Boost_LIBRARIES -+ # if the user is searching for the boost-thread component. -+ if(UNIX AND NOT CYGWIN) -+ list(FIND Boost_FIND_COMPONENTS thread _using_boost_thread) -+ if(_using_boost_thread GREATER -1) -+ find_library(BOOST_THREAD_LIBRARY NAMES pthread -+ DOC "The threading library used by boost-thread" -+ ) -+ if(BOOST_THREAD_LIBRARY) -+ set(${_outvar} ${ARGN} ${BOOST_THREAD_LIBRARY} PARENT_SCOPE) -+ endif() -+ endif() -+ endif() -+endfunction() -+ - # - # End functions/macros - # -@@ -1748,6 +1764,9 @@ if(Boost_FOUND) - list(APPEND Boost_LIBRARIES ${Boost_${UPPERCOMPONENT}_LIBRARY}) - endif() - endforeach() -+ -+ # Add pthread library on UNIX if thread component was found -+ _Boost_consider_adding_pthreads(Boost_LIBRARIES ${Boost_LIBRARIES}) - else() - if(Boost_FIND_REQUIRED) - message(SEND_ERROR "Unable to find the requested Boost libraries.\n${Boost_ERROR_REASON}") diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 8da2da8df..000000000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -FindBoost_add_-lpthread_#563479.diff