[fts] Drop -mt suffix from Boost SONAMEs
Petr Machata
pmachata at fedoraproject.org
Sat Jul 27 19:45:29 UTC 2013
commit 9cecf7208ba29ec9e9c2513a3160e4d3896e4c15
Author: Petr Machata <pmachata at redhat.com>
Date: Sat Jul 27 21:44:53 2013 +0200
Drop -mt suffix from Boost SONAMEs
fts-3.1.0-boost_mt.patch | 72 ++++++++++++++++++++++++++++++++++++++++++++++
fts.spec | 10 ++++--
2 files changed, 79 insertions(+), 3 deletions(-)
---
diff --git a/fts-3.1.0-boost_mt.patch b/fts-3.1.0-boost_mt.patch
new file mode 100644
index 0000000..16ec4f3
--- /dev/null
+++ b/fts-3.1.0-boost_mt.patch
@@ -0,0 +1,72 @@
+diff -urp fts-3.1.0/src/bdii-cache-update/CMakeLists.txt fts-3.1.0-pm/src/bdii-cache-update/CMakeLists.txt
+--- fts-3.1.0/src/bdii-cache-update/CMakeLists.txt 2013-07-24 10:08:23.000000000 +0200
++++ fts-3.1.0-pm/src/bdii-cache-update/CMakeLists.txt 2013-07-27 21:18:57.120791844 +0200
+@@ -30,7 +30,7 @@ add_dependencies(fts_bdii_cache_updater
+ target_link_libraries(fts_bdii_cache_updater -lfts_common)
+ target_link_libraries(fts_bdii_cache_updater -lfts_config)
+ target_link_libraries(fts_bdii_cache_updater -lfts_infosys)
+-target_link_libraries(fts_bdii_cache_updater -lboost_system-mt)
++target_link_libraries(fts_bdii_cache_updater -lboost_system)
+ target_link_libraries(fts_bdii_cache_updater -lpugixml)
+
+ install(TARGETS fts_bdii_cache_updater
+diff -urp fts-3.1.0/src/cli/CMakeLists.txt fts-3.1.0-pm/src/cli/CMakeLists.txt
+--- fts-3.1.0/src/cli/CMakeLists.txt 2013-07-24 10:08:51.000000000 +0200
++++ fts-3.1.0-pm/src/cli/CMakeLists.txt 2013-07-27 21:18:57.557794454 +0200
+@@ -57,7 +57,7 @@ set(fts_cli_libs
+ ${fts_cli_internal_libs}
+ gridsite
+ cgsi_plugin_cpp
+- boost_program_options-mt
++ boost_program_options
+ fts_delegation_api_simple
+ )
+
+diff -urp fts-3.1.0/src/common/CMakeLists.txt fts-3.1.0-pm/src/common/CMakeLists.txt
+--- fts-3.1.0/src/common/CMakeLists.txt 2013-07-24 10:08:28.000000000 +0200
++++ fts-3.1.0-pm/src/common/CMakeLists.txt 2013-07-27 21:18:57.080791606 +0200
+@@ -64,7 +64,7 @@ ${PROJECT_BINARY_DIR}/src/common
+
+
+ if(FTS3_COMPILE_WITH_UNITTEST)
+- target_link_libraries(fts_common -lboost_unit_test_framework-mt )
++ target_link_libraries(fts_common -lboost_unit_test_framework )
+ endif()
+
+
+diff -urp fts-3.1.0/src/glue2-publisher/CMakeLists.txt fts-3.1.0-pm/src/glue2-publisher/CMakeLists.txt
+--- fts-3.1.0/src/glue2-publisher/CMakeLists.txt 2013-07-24 10:08:51.000000000 +0200
++++ fts-3.1.0-pm/src/glue2-publisher/CMakeLists.txt 2013-07-27 21:18:57.250792621 +0200
+@@ -35,7 +35,7 @@ target_link_libraries(fts_info_publisher
+ target_link_libraries(fts_info_publisher -lfts_db_generic)
+ target_link_libraries(fts_info_publisher -lfts_config)
+ target_link_libraries(fts_info_publisher -lfts_common)
+-target_link_libraries(fts_info_publisher -lboost_system-mt)
++target_link_libraries(fts_info_publisher -lboost_system)
+
+ install(TARGETS fts_info_publisher
+ RUNTIME DESTINATION ${SBIN_INSTALL_DIR} )
+diff -urp fts-3.1.0/src/infosys/CMakeLists.txt fts-3.1.0-pm/src/infosys/CMakeLists.txt
+--- fts-3.1.0/src/infosys/CMakeLists.txt 2013-07-24 10:08:28.000000000 +0200
++++ fts-3.1.0-pm/src/infosys/CMakeLists.txt 2013-07-27 21:18:56.951790836 +0200
+@@ -49,7 +49,7 @@ ${PROJECT_BINARY_DIR}/src/infosys
+
+
+ if(FTS3_COMPILE_WITH_UNITTEST)
+- target_link_libraries(fts_infosys -lboost_unit_test_framework-mt )
++ target_link_libraries(fts_infosys -lboost_unit_test_framework )
+ endif()
+
+
+diff -urp fts-3.1.0/src/myosg-update/CMakeLists.txt fts-3.1.0-pm/src/myosg-update/CMakeLists.txt
+--- fts-3.1.0/src/myosg-update/CMakeLists.txt 2013-07-24 10:09:05.000000000 +0200
++++ fts-3.1.0-pm/src/myosg-update/CMakeLists.txt 2013-07-27 21:18:56.996791106 +0200
+@@ -27,7 +27,7 @@ add_dependencies(fts_myosg_updater fts_c
+ target_link_libraries(fts_myosg_updater -lcurl)
+ target_link_libraries(fts_myosg_updater -lfts_config)
+ target_link_libraries(fts_myosg_updater -lfts_common)
+-target_link_libraries(fts_myosg_updater -lboost_system-mt)
++target_link_libraries(fts_myosg_updater -lboost_system)
+
+ install(TARGETS fts_myosg_updater
+ RUNTIME DESTINATION ${SBIN_INSTALL_DIR} )
diff --git a/fts.spec b/fts.spec
index d9df8f3..e6d249b 100644
--- a/fts.spec
+++ b/fts.spec
@@ -14,6 +14,8 @@ URL: https://svnweb.cern.ch/trac/fts3/wiki
# svn export http://svnweb.cern.ch/guest/fts3/trunk
# tar -czvf fts-0.0.1-60.tar.gz fts-00160
Source0: https://grid-deployment.web.cern.ch/grid-deployment/dms/fts3/tar/%{name}-%{version}.tar.gz
+# Boost doesn't used tagged SONAMES anymore.
+Patch0: fts-3.1.0-boost_mt.patch
%if 0%{?el5}
BuildRequires: activemq-cpp-library
@@ -121,6 +123,7 @@ administering purposes.
%prep
%setup -qc
+%patch0 -p1
%build
@@ -285,9 +288,10 @@ exit 0
%changelog
-* Sat Jul 27 2013 pmachata at redhat.com - 3.1.0-2
-- Rebuild for boost 1.54.0
-
+* Sat Jul 27 2013 Petr Machata <pmachata at redhat.com> - 3.1.0-2
+ - rebuild for boost 1.54.0
+ - boost package doesn't use tagged sonames anymore, drop the -mt
+ suffix from several boost libraries (fts-3.1.0-boost_mt.patch)
* Wed Jul 24 2013 Michal Simon <michal.simon at cern.ch> - 3.0.3-15
- compatible with rawhide (f20)
* Fri Jul 02 2013 Michail Salichos <michail.salichos at cern.ch> - 3.0.3-14
More information about the scm-commits
mailing list