From 0892d34abc30f55f1c90f78c651cf9ce080a4a17 Mon Sep 17 00:00:00 2001
From: Josh Stone <jistone@redhat.com>
Date: Thu, 14 Feb 2013 11:36:18 -0800
Subject: [PATCH] Patch make.config to ensure rpm build flags are not
 discarded.

---
 dyninst-rpm-build-flags.patch | 15 +++++++++++++++
 dyninst.spec                  |  7 ++++++-
 2 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 dyninst-rpm-build-flags.patch

diff --git a/dyninst-rpm-build-flags.patch b/dyninst-rpm-build-flags.patch
new file mode 100644
index 0000000..56273f3
--- /dev/null
+++ b/dyninst-rpm-build-flags.patch
@@ -0,0 +1,15 @@
+--- dyninst/make.config.buildflags	2013-02-14 11:23:18.717002871 -0800
++++ dyninst/make.config	2013-02-14 11:23:46.588871846 -0800
+@@ -570,9 +570,9 @@ ifeq (ppc64_linux, $(findstring ppc64_li
+ endif
+ 
+ # flags for normal (non-kludge) files, with common warnings
+-CFLAGS		= $(IFLAGS) $(UNIFIED_DEF) $(OPT_FLAG) $(COMMON_WARNINGS) $(ARCH_FLAGS)
+-CXXFLAGS	= $(IFLAGS) $(UNIFIED_DEF) $(OPT_FLAG) $(COMMON_WARNINGS) $(STDINT_MACROS) $(ARCH_FLAGS)
+-LDFLAGS		= $(ARCH_FLAGS)
++CFLAGS		+= $(IFLAGS) $(UNIFIED_DEF) $(OPT_FLAG) $(COMMON_WARNINGS) $(ARCH_FLAGS)
++CXXFLAGS	+= $(IFLAGS) $(UNIFIED_DEF) $(OPT_FLAG) $(COMMON_WARNINGS) $(STDINT_MACROS) $(ARCH_FLAGS)
++LDFLAGS		+= $(ARCH_FLAGS)
+ 
+ # flags for kludge files, won't have warnings generated
+ KFLAGS          = $(IFLAGS) $(UNIFIED_DEF) $(BASICWARNINGS)
diff --git a/dyninst.spec b/dyninst.spec
index bdeb267..6665bfe 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: 3%{?dist}
+Release: 4%{?dist}
 URL: http://www.dyninst.org
 Version: 8.0
 Exclusiveos: linux
@@ -20,6 +20,7 @@ ExcludeArch: s390 s390x %{arm}
 #  gunzip -c dyninst-docs-8.0.tar.gz | git get-tar-commit-id
 Source0: %{name}-%{version}.tar.gz
 Source1: %{name}-docs-%{version}.tar.gz
+Patch1: dyninst-rpm-build-flags.patch
 Patch5: dyninst-unused_vars.patch
 BuildRequires: libdwarf-devel >= 20111030
 BuildRequires: elfutils-libelf-devel
@@ -64,6 +65,7 @@ the dyninst user-space libraries and interfaces.
 %setup -q -T -D -a 1
 
 pushd dyninst
+%patch1 -p1 -b .buildflags
 %patch5 -p1 -b .unused
 popd
 
@@ -124,6 +126,9 @@ chmod 644 %{buildroot}%{_libdir}/dyninst/*.a
 %{_libdir}/dyninst/*.a
 
 %changelog
+* Thu Feb 14 2013 Josh Stone <jistone@redhat.com> 8.0-4
+- Patch make.config to ensure rpm build flags are not discarded.
+
 * Sun Feb 10 2013 Denis Arnaud <denis.arnaud_fedora@m4x.org> - 8.0-3
 - Rebuild for Boost-1.53.0