[med-svn] [SCM] Free software framework for ludic-therapeutic activities branch, debian, updated. upstream/1.0.1-8-g5c4ed76

Andreas Tille tille at debian.org
Fri Nov 4 09:10:07 UTC 2011


The following commit has been merged in the debian branch:
commit 2b98514701a871174c3ae50e1b491fc7ec5fc1e5
Author: Andreas Tille <tille at debian.org>
Date:   Fri Nov 4 09:28:09 2011 +0100

    Apply patch from Ilya Barygin <randomaction at ubuntu.com> to fix FTBFS with ld --as-needed

diff --git a/debian/patches/as-needed.patch b/debian/patches/as-needed.patch
new file mode 100644
index 0000000..2f43332
--- /dev/null
+++ b/debian/patches/as-needed.patch
@@ -0,0 +1,28 @@
+Description: fix underlinked library libsphost.a
+ This allows building with --as-needed linker option.
+Author: Ilya Barygin <randomaction at ubuntu.com>
+
+--- sitplus-1.0.1.orig/src/sphost/CMakeLists.txt
++++ sitplus-1.0.1/src/sphost/CMakeLists.txt
+@@ -22,6 +22,7 @@
+ target_link_libraries(sphost widgets_base)
+ target_link_libraries(sphost ${Boost_FILESYSTEM_LIBRARY})
+ target_link_libraries(sphost ${Boost_THREAD_LIBRARY})
++target_link_libraries(sphost ${Boost_SYSTEM_LIBRARY})
+ 
+ if (ENABLE_NLS)
+ 	target_link_libraries(sphost ${LIBINTL_LIBRARIES})
+--- sitplus-1.0.1.orig/CMakeLists.txt
++++ sitplus-1.0.1/CMakeLists.txt
+@@ -129,9 +129,11 @@ set(Boost_USE_MULTITHREAD ON)
+ 
+ find_package(Boost COMPONENTS thread REQUIRED)
+ find_package(Boost COMPONENTS program_options REQUIRED)
++find_package(Boost COMPONENTS system REQUIRED)
+ message(STATUS "Boost_INCLUDE_DIR    : ${Boost_INCLUDE_DIR}")
+ message(STATUS "Boost_THREAD_LIBRARY : ${Boost_THREAD_LIBRARY}")
+ message(STATUS "Boost_PROGRAM_OPTIONS_LIBRARY : ${Boost_PROGRAM_OPTIONS_LIBRARY}")
++message(STATUS "Boost_SYSTEM_LIBRARY : ${Boost_SYSTEM_LIBRARY}")
+ 
+ # Boost version 1.39 or greater required 
+ # Lower versions fail to compile with g++ 4.4
diff --git a/debian/patches/series b/debian/patches/series
index c60d597..ec63efe 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 lib_location_fix.diff
 packager.diff
 spelling.diff
+as-needed.patch

-- 
Free software framework for ludic-therapeutic activities



More information about the debian-med-commit mailing list