[redhat-rpm-config: 171/215] redhat-rpm-config-9.1.0-relro.patch: LDFLAGS, not CFLAGS.

Panu Matilainen pmatilai at fedoraproject.org
Wed Apr 2 10:32:47 UTC 2014


commit 4b29a24132ba9e70df0b36917dfdb5ef51e1a9c1
Author: Adam Jackson <ajax at redhat.com>
Date:   Thu Jul 7 13:17:24 2011 -0400

    redhat-rpm-config-9.1.0-relro.patch: LDFLAGS, not CFLAGS.

 macros |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
---
diff --git a/macros b/macros
index d95b614..743652a 100644
--- a/macros
+++ b/macros
@@ -31,6 +31,7 @@
   CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; \
   CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \
   FFLAGS="${FFLAGS:-%optflags -I%_fmoddir}" ; export FFLAGS ; \
+  LDFLAGS="${LDFLAGS:-%__global_ldflags}"; export LDFLAGS; \
   %{_configure} --build=%{_build} --host=%{_host} \\\
 	--program-prefix=%{?_program_prefix} \\\
 	--disable-dependency-tracking \\\
@@ -183,7 +184,8 @@ unset DISPLAY\
 %__find_provides        /usr/lib/rpm/redhat/find-provides
 %__find_requires        /usr/lib/rpm/redhat/find-requires
 
-%__global_cflags	-O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -Wl,-z,relro
+%__global_cflags	-O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4
+%__global_ldflags	-Wl,-z,relro
 
 # Use these macros to differentiate between RH and other KMP implementation(s).
 redhat_kernel_module_package	1


More information about the scm-commits mailing list