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.
This commit is contained in:
Todd Zullinger 2016-05-18 12:42:21 -04:00 committed by Petr Stodulka
commit a37eeb40e9

View file

@ -42,6 +42,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.7.4
Release: 2%{?dist}
@ -688,7 +693,9 @@ rm -rf %{buildroot}
%changelog
* Fri Jul 01 2016 Petr Stodulka <pstodulk@redhat.com> - 2.7.4-2
- Set LDFLAGS for hardened builds (#1289728) (thanks Todd)
- Set LDFLAGS for hardened builds (#1289728)
and define __global_ldflags on EL < 7 (#1337137)
(Thanks Todd)
* Fri Mar 18 2016 David Woodhouse <dwmw2@infradead.org> - 2.7.4-1
- Update to 2.7.4 (for CVE-2016-2315, CVE-2016-2324)