[ogre] Update ogre-thread.patch to exclude -mt suffix
Petr Machata
pmachata at fedoraproject.org
Sun Jul 28 22:39:00 UTC 2013
commit e908875c12d600a0085aabe3d013ef332abaab91
Author: Petr Machata <pmachata at redhat.com>
Date: Mon Jul 29 00:38:10 2013 +0200
Update ogre-thread.patch to exclude -mt suffix
ogre-thread.patch | 10 ++++++++--
ogre.spec | 8 ++++++--
2 files changed, 14 insertions(+), 4 deletions(-)
---
diff --git a/ogre-thread.patch b/ogre-thread.patch
index 2e90c49..0a523b0 100644
--- a/ogre-thread.patch
+++ b/ogre-thread.patch
@@ -1,12 +1,18 @@
--- CMake/ConfigureBuild.cmake.thread 2012-09-02 00:27:14.000000000 -0500
+++ CMake/ConfigureBuild.cmake 2012-12-09 23:48:31.709984746 -0600
-@@ -178,6 +178,9 @@
+@@ -178,10 +178,13 @@
if (OGRE_CONFIG_THREADS GREATER 0)
set(OGRE_CFLAGS "-pthread")
set(OGRE_ADDITIONAL_LIBS "${OGRE_ADDITIONAL_LIBS} -lpthread")
+ if (OGRE_THREAD_PROVIDER EQUAL 1)
-+ set(OGRE_ADDITIONAL_LIBS "${OGRE_ADDITIONAL_LIBS} -lboost_system-mt")
++ set(OGRE_ADDITIONAL_LIBS "${OGRE_ADDITIONAL_LIBS} -lboost_system")
+ endif ()
endif ()
if (OGRE_STATIC)
if (OGRE_CONFIG_THREADS)
+- set(OGRE_ADDITIONAL_LIBS "${OGRE_ADDITIONAL_LIBS} -lboost-thread-mt")
++ set(OGRE_ADDITIONAL_LIBS "${OGRE_ADDITIONAL_LIBS} -lboost-thread")
+ endif ()
+ # there is no pkgconfig file for freeimage, so we need to add that lib manually
+ set(OGRE_ADDITIONAL_LIBS "${OGRE_ADDITIONAL_LIBS} -lfreeimage")
+
diff --git a/ogre.spec b/ogre.spec
index aa77875..64d08a6 100644
--- a/ogre.spec
+++ b/ogre.spec
@@ -1,6 +1,6 @@
Name: ogre
Version: 1.8.1
-Release: 8%{?dist}
+Release: 9%{?dist}
Summary: Object-Oriented Graphics Rendering Engine
# MIT with exceptions - main library
# CC-BY-SA - devel docs
@@ -286,7 +286,11 @@ mv $RPM_BUILD_ROOT%{_libdir}/OGRE/cmake/* $RPM_BUILD_ROOT%{_datadir}/cmake/Modul
%changelog
-* Sat Jul 27 2013 pmachata at redhat.com - 1.8.1-8
+* Sun Jul 28 2013 Petr Machata <pmachata at redhat.com> - 1.8.1-9
+- Update ogre-thread.patch to exclude -mt suffix from Boost.Thread and
+ Boost.System DSO's.
+
+* Sat Jul 27 2013 Petr Machata <pmachata at redhat.com> - 1.8.1-8
- Rebuild for boost 1.54.0
* Sat Apr 20 2013 Bruno Wolff III <bruno at wolff.to> - 1.8.1-7
More information about the scm-commits
mailing list