rpms/git
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Use build_cflags/build_ldflags instead of optflags/__global_ldflags

Browse Source 
The build_cflags and build_ldflags macros replace the deprecated
optflags and __global_ldflags macros, per buildflags.md in
redhat-rpm-config¹.

Note: EPEL provides these macros for compatibility.

¹ https://src.fedoraproject.org/rpms/redhat-rpm-config/blob/master/f/buildflags.md
This commit is contained in:
Todd Zullinger 2019-02-06 21:04:09 -05:00
parent 10da171608
commit 95fc1fa70e
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
git.spec
View File

@ -79,8 +79,8 @@
# Hardening flags for EL-6 # Hardening flags for EL-6
%if 0%{?rhel} == 6 %if 0%{?rhel} == 6
%global optflags %{optflags} -fPIC -pie %global build_cflags %{build_cflags} -fPIC -pie
%global __global_ldflags -Wl,-z,relro -Wl,-z,now %global build_ldflags -Wl,-z,relro -Wl,-z,now
%endif %endif
# Define for release candidates # Define for release candidates
@ -477,8 +477,8 @@ sed -i '/^git-p4/d' command-list.txt
# Otherwise it will rebuild in %%install due to flags changes. # Otherwise it will rebuild in %%install due to flags changes.
cat << \EOF > config.mak cat << \EOF > config.mak
V = 1 V = 1
CFLAGS = %{optflags} CFLAGS = %{build_cflags}
LDFLAGS = %{__global_ldflags} LDFLAGS = %{build_ldflags}
NEEDS_CRYPTO_WITH_SSL = 1 NEEDS_CRYPTO_WITH_SSL = 1
USE_LIBPCRE = 1 USE_LIBPCRE = 1
ETC_GITCONFIG = %{_sysconfdir}/gitconfig ETC_GITCONFIG = %{_sysconfdir}/gitconfig
@ -957,6 +957,7 @@ rmdir --ignore-fail-on-non-empty "$testdir"
- Work around gpg-agent issues in the test suite - Work around gpg-agent issues in the test suite
- Drop gnupg BuildRequires on fedora >= 30 - Drop gnupg BuildRequires on fedora >= 30
- Fix formatting of contrib/{contacts,subtree} docs - Fix formatting of contrib/{contacts,subtree} docs
- Use %%{build_cflags} and %%{build_ldflags}
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.20.1-1.1 * Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.20.1-1.1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild