From 8570b1c6e80b127438bf1ceb110376bf729629a3 Mon Sep 17 00:00:00 2001
From: Josh Stone <jistone@redhat.com>
Date: Dec 12 2013 02:14:18 +0000
Subject: Fix rhbz1040715 (testsuite g++ optimization)


---

diff --git a/dyninst-8.1.2-testsuite-opt.patch b/dyninst-8.1.2-testsuite-opt.patch
new file mode 100644
index 0000000..548ad30
--- /dev/null
+++ b/dyninst-8.1.2-testsuite-opt.patch
@@ -0,0 +1,12 @@
+diff -up dyninst/testsuite/make.module.tmpl.testsuite-opt dyninst/testsuite/make.module.tmpl
+--- dyninst/testsuite/make.module.tmpl.testsuite-opt	2013-12-11 17:01:03.278606211 -0800
++++ dyninst/testsuite/make.module.tmpl	2013-12-11 17:02:24.593743942 -0800
+@@ -23,7 +23,7 @@ LFLAGS = -L../../common/$(PLATFORM) -L..
+ # Turn off NO_INITIALIZER_LIST_SUPPORT if we compile test suite with C++11
+ CFLAGS = $(UNIFIED_TEST_DEF:%=%_test) $(ARCH_FLAGS) $(AC_DEF) $(FIRST_INCLUDE) $(IFLAGS) -I../src -g $(BOOST_INCDIR) $(CPPFLAGS)
+ CXXFLAGS = $(CFLAGS)
+-CXXFLAGS += $(PLATFORM_CXXFLAGS) $(CXX_REQ_FLAGS)
++CXXFLAGS += $(PLATFORM_CXXFLAGS) -std=c++11
+ 
+ CFLAGS_NATIVE = $(CFLAGS)
+ CXXFLAGS_NATIVE = $(CXXFLAGS)
diff --git a/dyninst.spec b/dyninst.spec
index b4f2761..41cf2e3 100644
--- a/dyninst.spec
+++ b/dyninst.spec
@@ -2,7 +2,7 @@ Summary: An API for Run-time Code Generation
 License: LGPLv2+
 Name: dyninst
 Group: Development/Libraries
-Release: 5%{?dist}
+Release: 6%{?dist}
 URL: http://www.dyninst.org
 Version: 8.1.2
 Exclusiveos: linux
@@ -24,6 +24,7 @@ Patch1: dyninst-rpm-build-flags.patch
 Patch2: dyninst-install-testsuite.patch
 Patch3: dyninst-pokeuser.patch
 Patch4: dyninst-Werror-format-security.patch
+Patch5: dyninst-8.1.2-testsuite-opt.patch
 BuildRequires: libdwarf-devel >= 20111030
 BuildRequires: elfutils-libelf-devel
 BuildRequires: boost-devel
@@ -89,6 +90,7 @@ pushd dyninst
 %patch2 -p1 -b .testsuite
 %patch3 -p1 -b .pokeuser
 %patch4 -p1 -d testsuite -b .format-security
+%patch5 -p1 -b .testsuite-opt
 popd
 
 
@@ -159,6 +161,9 @@ chmod 644 %{buildroot}%{_libdir}/dyninst/testsuite/*
 %attr(755,root,root) %{_libdir}/dyninst/testsuite/*
 
 %changelog
+* Wed Dec 11 2013 Josh Stone <jistone@redhat.com> 8.1.2-6
+- Fix rhbz1040715 (testsuite g++ optimization)
+
 * Tue Dec 03 2013 Josh Stone <jistone@redhat.com> 8.1.2-5
 - Fix rhbz1037048 (-Werror=format-security FTBFS)