From 72c240de2abb68f07e702db21bc841bfdc97bc68 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Wed, 18 May 2016 12:42:21 -0400 Subject: [PATCH] Define __global_ldflags on EL < 7 (#1337137) Building on EL was unintentionally broken by 58fa169 (Set LDFLAGS for hardened builds (#1289728), 2016-04-11). Thanks to Dimitry Andric for reporting this issue. --- git.spec | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/git.spec b/git.spec index de4586b..0817d54 100644 --- a/git.spec +++ b/git.spec @@ -48,6 +48,11 @@ %global use_systemd 0 %endif +# Settings for EL <= 7 +%if 0%{?rhel} && 0%{?rhel} <= 7 +%{!?__global_ldflags: %global __global_ldflags -Wl,-z,relro} +%endif + Name: git Version: 2.8.2 Release: 4%{?dist} @@ -732,6 +737,7 @@ rm -rf %{buildroot} %changelog * Wed May 18 2016 Todd Zullinger - 2.8.2-4 - Use perl(MOD::NAME) format for perl-DBD-SQLite and perl-Digest-MD5 deps +- Define __global_ldflags on EL < 7 (#1337137) * Wed May 18 2016 Jitka Plesnikova - 2.8.2-3 - Perl 5.24 re-rebuild of bootstrapped packages