[dmlite] Drop -mt from boost DSO's
Petr Machata
pmachata at fedoraproject.org
Sat Jul 27 19:15:12 UTC 2013
commit e1cf4c492d78bc0266ee28ed6a2b18ab1c4d900c
Author: Petr Machata <pmachata at redhat.com>
Date: Sat Jul 27 21:14:30 2013 +0200
Drop -mt from boost DSO's
dmlite-boost_mt.patch | 24 ++++++++++++++++++++++++
dmlite.spec | 11 ++++++++++-
2 files changed, 34 insertions(+), 1 deletions(-)
---
diff --git a/dmlite-boost_mt.patch b/dmlite-boost_mt.patch
new file mode 100644
index 0000000..fc31041
--- /dev/null
+++ b/dmlite-boost_mt.patch
@@ -0,0 +1,24 @@
+diff -up dmlite-0.6.1/src/CMakeLists.txt~ dmlite-0.6.1/src/CMakeLists.txt
+--- dmlite-0.6.1/src/CMakeLists.txt~ 2013-07-03 13:28:35.000000000 +0200
++++ dmlite-0.6.1/src/CMakeLists.txt 2013-07-27 21:06:36.197342017 +0200
+@@ -9,7 +9,7 @@ add_library(dmlite SHARED ${DMLITE_CAPI_
+ ${DMLITE_CORE_SOURCES}
+ ${DMLITE_UTILS_SOURCES})
+
+-target_link_libraries (dmlite boost_regex boost_thread-mt crypto dl pthread ssl z)
++target_link_libraries (dmlite boost_regex boost_thread crypto dl pthread ssl z)
+
+ set_target_properties(dmlite PROPERTIES
+ VERSION ${dmlite_MAJOR}.${dmlite_MINOR}.${dmlite_PATCH}
+diff -up dmlite-0.6.1/tests/cpp/CMakeLists.txt~ dmlite-0.6.1/tests/cpp/CMakeLists.txt
+--- dmlite-0.6.1/tests/cpp/CMakeLists.txt~ 2013-07-03 13:28:35.000000000 +0200
++++ dmlite-0.6.1/tests/cpp/CMakeLists.txt 2013-07-27 21:06:18.613236789 +0200
+@@ -77,7 +77,7 @@ add_executable (test-put test-put
+ target_link_libraries (test-put test-base dmlite ${CPPUNIT_LIBRARY} dl)
+
+ add_executable (test-poolcontainer test-poolcontainer.cpp)
+-target_link_libraries (test-poolcontainer dmlite ${CPPUNIT_LIBRARY} pthread boost_thread-mt)
++target_link_libraries (test-poolcontainer dmlite ${CPPUNIT_LIBRARY} pthread boost_thread)
+
+ add_executable (test-pools test-pools.cpp)
+ target_link_libraries (test-pools test-base dmlite ${CPPUNIT_LIBRARY} dl)
diff --git a/dmlite.spec b/dmlite.spec
index b2a1fa6..2745d76 100644
--- a/dmlite.spec
+++ b/dmlite.spec
@@ -12,6 +12,10 @@ URL: https://svnweb.cern.ch/trac/lcgdm/wiki/Dpm/Dev/Dmlite
Source0: %{name}-%{version}.tar.gz
# We currently don't package tests in fedora
Patch0: dmlite-disable-tests.patch
+%if %{?fedora}%{!?fedora:0} >= 20
+# Boost package doesn't use tagged sonames anymore.
+Patch1: dmlite-boost_mt.patch
+%endif
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%if %{?fedora}%{!?fedora:0} >= 10 || %{?rhel}%{!?rhel:0} >= 6
@@ -60,6 +64,9 @@ Man pages and HTML documentation for dmlite.
%setup -q -n %{name}-%{version}
%patch0 -p1
+%if %{?fedora}%{!?fedora:0} >= 20
+%patch1 -p1
+%endif
%build
%cmake . -DCMAKE_INSTALL_PREFIX=/ -DBUILD_PYTHON=OFF
@@ -100,8 +107,10 @@ rm -rf %{buildroot}
%{_defaultdocdir}/%{name}-%{version}
%changelog
-* Sat Jul 27 2013 pmachata at redhat.com - 0.6.1-2
+* Sat Jul 27 2013 Petr Machata <pmachata at redhat.com> - 0.6.1-2
- Rebuild for boost 1.54.0
+- Boost package doesn't use tagged sonames anymore, drop the -mt
+ suffix from linker command line (dmlite-boost_mt.patch)
* Wed Jul 10 2013 Alejandro Alvarez <aalvarez at cern.ch> - 0.6.1-1
- Update for new upstream release
More information about the scm-commits
mailing list