Patch make.config to ensure rpm build flags are not discarded.

This commit is contained in:
Josh Stone 2013-02-14 11:36:18 -08:00
parent 3017702e8f
commit 0892d34abc
2 changed files with 21 additions and 1 deletions

View File

@ -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)

View File

@ -2,7 +2,7 @@ Summary: An API for Run-time Code Generation
License: LGPLv2+ License: LGPLv2+
Name: dyninst Name: dyninst
Group: Development/Libraries Group: Development/Libraries
Release: 3%{?dist} Release: 4%{?dist}
URL: http://www.dyninst.org URL: http://www.dyninst.org
Version: 8.0 Version: 8.0
Exclusiveos: linux Exclusiveos: linux
@ -20,6 +20,7 @@ ExcludeArch: s390 s390x %{arm}
# gunzip -c dyninst-docs-8.0.tar.gz | git get-tar-commit-id # gunzip -c dyninst-docs-8.0.tar.gz | git get-tar-commit-id
Source0: %{name}-%{version}.tar.gz Source0: %{name}-%{version}.tar.gz
Source1: %{name}-docs-%{version}.tar.gz Source1: %{name}-docs-%{version}.tar.gz
Patch1: dyninst-rpm-build-flags.patch
Patch5: dyninst-unused_vars.patch Patch5: dyninst-unused_vars.patch
BuildRequires: libdwarf-devel >= 20111030 BuildRequires: libdwarf-devel >= 20111030
BuildRequires: elfutils-libelf-devel BuildRequires: elfutils-libelf-devel
@ -64,6 +65,7 @@ the dyninst user-space libraries and interfaces.
%setup -q -T -D -a 1 %setup -q -T -D -a 1
pushd dyninst pushd dyninst
%patch1 -p1 -b .buildflags
%patch5 -p1 -b .unused %patch5 -p1 -b .unused
popd popd
@ -124,6 +126,9 @@ chmod 644 %{buildroot}%{_libdir}/dyninst/*.a
%{_libdir}/dyninst/*.a %{_libdir}/dyninst/*.a
%changelog %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 * Sun Feb 10 2013 Denis Arnaud <denis.arnaud_fedora@m4x.org> - 8.0-3
- Rebuild for Boost-1.53.0 - Rebuild for Boost-1.53.0