From e0ccf01bfc428320fed9c567c989543716cb79ce Mon Sep 17 00:00:00 2001 From: Petr Machata Date: May 25 2014 13:52:01 +0000 Subject: Don't add -mt to boost DSO names --- diff --git a/player-3.0.2.boost155.patch b/player-3.0.2.boost155.patch new file mode 100644 index 0000000..8d9d4cd --- /dev/null +++ b/player-3.0.2.boost155.patch @@ -0,0 +1,18 @@ +diff -up player-3.0.2/client_libs/libplayerc\+\+/CMakeLists.txt\~ player-3.0.2/client_libs/libplayerc\+\+/CMakeLists.txt +--- player-3.0.2/client_libs/libplayerc++/CMakeLists.txt~ 2014-05-25 15:29:00.407677202 +0200 ++++ player-3.0.2/client_libs/libplayerc++/CMakeLists.txt 2014-05-25 15:31:23.880919221 +0200 +@@ -104,11 +104,7 @@ IF (BUILD_PLAYERCC) + OPTION (Boost_USE_MULTITHREAD "Use the multithreaded versions of the Boost libraries" OFF) + ENDIF (PLAYER_OS_OSX) + MARK_AS_ADVANCED (Boost_USE_MULTITHREAD) +- IF (Boost_USE_MULTITHREAD) +- SET (BOOST_LIB_SUFFIX "-mt" CACHE STRING "Boost library name suffix") +- ELSE (Boost_USE_MULTITHREAD) +- SET (BOOST_LIB_SUFFIX "" CACHE STRING "Boost library name suffix") +- ENDIF (Boost_USE_MULTITHREAD) ++ SET (BOOST_LIB_SUFFIX "" CACHE STRING "Boost library name suffix") + MARK_AS_ADVANCED (BOOST_LIB_SUFFIX) + + IF (HAVE_BOOST_THREAD) + +Diff finished. Sun May 25 15:31:28 2014 diff --git a/player.spec b/player.spec index 65e957a..754586f 100644 --- a/player.spec +++ b/player.spec @@ -24,6 +24,7 @@ Patch9: %{name}-3.0.2.boost150.patch Patch10: %{name}-3.0.2.phidgetrfid.patch # Some hacks to make player compile against libstatgrab-0.90 Patch11: %{name}-3.0.2.libstatgrab-0.90.patch +Patch12: %{name}-3.0.2.boost155.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # Sort order: build tools, feature libs, within alphabetically, group related @@ -149,6 +150,7 @@ are experimental. # Patch only applicable for libstatgrab >= 0.90 %patch11 -p1 %endif +%patch12 -p1 find . -name '*.c' -exec chmod -x {} \; find . -name '*.cc' -exec chmod -x {} \; find . -name '*.cpp' -exec chmod -x {} \; @@ -241,6 +243,9 @@ rm -rf $RPM_BUILD_ROOT %{ruby_vendorarchdir}/*.so %changelog +* Sun May 25 2014 Petr Machata - 3.0.2-35 +- Don't add -mt to boost DSO names (player-3.0.2.boost155.patch) + * Fri May 23 2014 David Tardon - 3.0.2-35 - rebuild for boost 1.55.0