rpms/ghc-rpm-macros
6
0
Fork 0
Code Issues Pull Requests Releases Activity

keep %ghc_set_gcc_flags name

Browse Source
This commit is contained in:
Jens Petersen 2018-10-06 01:47:11 +09:00
parent 975f21c108
commit 153f50041f
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ghc-rpm-macros.spec
View File

@ -11,7 +11,7 @@
Name: ghc-rpm-macros Name: ghc-rpm-macros
Version: 1.9.5 Version: 1.9.5
Release: 1%{?dist} Release: 2%{?dist}
Summary: RPM macros for building Haskell packages for GHC Summary: RPM macros for building Haskell packages for GHC
License: GPLv3+ License: GPLv3+
@ -170,6 +170,9 @@ EOF
%changelog %changelog
* Sat Oct 6 2018 Jens Petersen <petersen@redhat.com> - 1.9.5-2
- fix ghc_set_gcc_flags name
* Sat Oct 6 2018 Jens Petersen <petersen@redhat.com> - 1.9.5-1 * Sat Oct 6 2018 Jens Petersen <petersen@redhat.com> - 1.9.5-1
- disable hardened ldflags again - disable hardened ldflags again

2
macros.ghc
View File

@ -10,7 +10,7 @@ LANG=en_US.utf8\
%ghc_version %{!?ghc_version_override:%(ghc --numeric-version)}%{?ghc_version_override} %ghc_version %{!?ghc_version_override:%(ghc --numeric-version)}%{?ghc_version_override}
%ghc_set_cflags\ %ghc_set_gcc_flags\
export CFLAGS="${CFLAGS:-%optflags}"\ export CFLAGS="${CFLAGS:-%optflags}"\
%global _hardened_ldflags %{nil}\ %global _hardened_ldflags %{nil}\
export LDFLAGS="${LDFLAGS:-%{?__global_ldflags}}"\ export LDFLAGS="${LDFLAGS:-%{?__global_ldflags}}"\