[undertaker] Boost.Wave and Boost.System DSO's do not include -mt suffix anymore
Petr Machata
pmachata at fedoraproject.org
Sat Jul 27 22:46:36 UTC 2013
commit 882a5b3b20c9d45c639b50f609a3100056b25390
Author: Petr Machata <pmachata at redhat.com>
Date: Sun Jul 28 00:46:11 2013 +0200
Boost.Wave and Boost.System DSO's do not include -mt suffix anymore
undertaker-boost_mt.patch | 24 ++++++++++++++++++++++++
undertaker.spec | 8 +++++++-
2 files changed, 31 insertions(+), 1 deletions(-)
---
diff --git a/undertaker-boost_mt.patch b/undertaker-boost_mt.patch
new file mode 100644
index 0000000..53e7e87
--- /dev/null
+++ b/undertaker-boost_mt.patch
@@ -0,0 +1,24 @@
+diff -up vamos-1.2/undertaker/Makefile~ vamos-1.2/undertaker/Makefile
+--- vamos-1.2/undertaker/Makefile~ 2013-07-28 00:21:11.976114955 +0200
++++ vamos-1.2/undertaker/Makefile 2013-07-28 00:42:47.170943941 +0200
+@@ -13,7 +13,7 @@ CXXFLAGS = $(CFLAGS)
+
+ LDFLAGS = -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -m64 -mtune=generic
+ # LDCOV = -coverage
+-LDLIBS = libparser.a ../ziz/libziz.a -lstdc++ -lboost_system -lboost_regex -lboost_filesystem -lpicosat -lboost_wave-mt $(LDCOV)
++LDLIBS = libparser.a ../ziz/libziz.a -lstdc++ -lboost_system -lboost_regex -lboost_filesystem -lpicosat -lboost_wave $(LDCOV)
+
+ PARSEROBJ = RsfReader.o KconfigWhitelist.o ConfigurationModel.o \
+ ModelContainer.o SatChecker.o BlockDefectAnalyzer.o \
+diff -up vamos-1.2/ziz/Makefile~ vamos-1.2/ziz/Makefile
+--- vamos-1.2/ziz/Makefile~ 2013-07-28 00:21:11.983114997 +0200
++++ vamos-1.2/ziz/Makefile 2013-07-28 00:42:22.378794488 +0200
+@@ -3,7 +3,7 @@ LDXX=g++ $(CXXFLAGS)
+ DEBUG=
+ CFLAGS = -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -m64 -mtune=generic $(DEBUG)
+ CXXFLAGS = $(CFLAGS)
+-LDLIBS = -lboost_regex -lboost_wave-mt -lboost_system-mt $(LDCOV)
++LDLIBS = -lboost_regex -lboost_wave -lboost_system $(LDCOV)
+
+ ZIZOBJ = Ziz.o
+ HEADERS = $(wildcard *.h)
diff --git a/undertaker.spec b/undertaker.spec
index 05380b0..0f02d67 100644
--- a/undertaker.spec
+++ b/undertaker.spec
@@ -7,6 +7,8 @@ Group: Development/Languages
License: GPLv2 and GPLv3+
URL: http://vamos.informatik.uni-erlangen.de/trac/undertaker
Source0: http://vamos.informatik.uni-erlangen.de/files/%{name}-%{version}.tar.gz
+# As of F20, Boost doesn't ship -mt DSO's anymore.
+Patch0: undertaker-boost_mt.patch
BuildRequires: boost-devel
BuildRequires: emacs
@@ -110,6 +112,8 @@ for f in DeadAnalysis ElDocumentation Interactive ModelFiles Preconditions; do
rm -f doc/Undertaker$f.orig
done
+%patch0 -p1
+
%build
# FIXME: building with %%{?_smp_mflags} sometimes fails
make PREFIX=%{_prefix} LIBDIR=%{_libdir} \
@@ -159,8 +163,10 @@ cd $RPM_BUILD_ROOT%{_emacs_sitelispdir}/%{name}
%{_xemacs_sitelispdir}/%{name}/*.el
%changelog
-* Sat Jul 27 2013 pmachata at redhat.com - 1.2-10
+* Sat Jul 27 2013 Petr Machata <pmachata at redhat.com> - 1.2-10
- Rebuild for boost 1.54.0
+- Boost.Wave and Boost.System DSO's do not include -mt suffix anymore
+ (undertaker-boost_mt.patch).
* Sat Feb 09 2013 Denis Arnaud <denis.arnaud_fedora at m4x.org> - 1.2-9
- Rebuild for Boost-1.53.0
More information about the scm-commits
mailing list