From 5ec4cc65c25861076e0f5aad5c678e0158a3bcb0 Mon Sep 17 00:00:00 2001 From: Panu Matilainen Date: Mon, 22 Apr 2013 13:20:19 +0300 Subject: [PATCH] - Add -grecord-gcc-switches to global CFLAGS (#951669) --- redhat-rpm-config-9.1.0-record-switches.patch | 12 ++++++++++++ redhat-rpm-config.spec | 8 +++++++- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 redhat-rpm-config-9.1.0-record-switches.patch diff --git a/redhat-rpm-config-9.1.0-record-switches.patch b/redhat-rpm-config-9.1.0-record-switches.patch new file mode 100644 index 0000000..881e366 --- /dev/null +++ b/redhat-rpm-config-9.1.0-record-switches.patch @@ -0,0 +1,12 @@ +diff -up redhat-rpm-config-9.1.0/macros.record-switches redhat-rpm-config-9.1.0/macros +--- redhat-rpm-config-9.1.0/macros.record-switches 2013-04-22 13:17:29.319358036 +0300 ++++ redhat-rpm-config-9.1.0/macros 2013-04-22 13:17:44.665308442 +0300 +@@ -171,7 +171,7 @@ package or when debugging this package.\ + %_hardened_cflags %{?_hardened_build:%{_hardening_cflags}} + %_hardened_ldflags %{?_hardened_build:%{_hardening_ldflags}} + +-%__global_cflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 %{_hardened_cflags} ++%__global_cflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -grecord-gcc-switches %{_hardened_cflags} + %__global_ldflags -Wl,-z,relro %{_hardened_ldflags} + + # Use these macros to differentiate between RH and other KMP implementation(s). diff --git a/redhat-rpm-config.spec b/redhat-rpm-config.spec index 813cc68..b6b39a5 100644 --- a/redhat-rpm-config.spec +++ b/redhat-rpm-config.spec @@ -1,7 +1,7 @@ Summary: Red Hat specific rpm configuration files Name: redhat-rpm-config Version: 9.1.0 -Release: 40%{?dist} +Release: 41%{?dist} # No version specified. License: GPL+ Group: Development/System @@ -45,6 +45,8 @@ Patch15: 0001-Drop-un-setting-LANG-and-DISPLAY-in-various-build-st.patch Patch16: redhat-rpm-config-9.1.0-filtering-spaces-in-filename.patch # https://bugzilla.redhat.com/show_bug.cgi?id=872737 Patch17: redhat-rpm-config-9.1.0-java-repack-spaces-in-filenames.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=951669 +Patch18: redhat-rpm-config-9.1.0-record-switches.patch BuildArch: noarch Requires: coreutils Requires: perl-srpm-macros @@ -77,6 +79,7 @@ Red Hat specific rpm configuration files. %patch15 -p1 %patch16 -p1 %patch17 -p1 +%patch18 -p1 %build @@ -98,6 +101,9 @@ rm -rf ${RPM_BUILD_ROOT} %{_sysconfdir}/rpm/* %changelog +* Mon Apr 22 2013 Panu Matilainen - 9.1.0-41 +- Add -grecord-gcc-switches to global CFLAGS (#951669) + * Mon Mar 25 2013 Panu Matilainen - 9.1.0-40 - Add virtual system-rpm-config provide