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

%ghc_set_gcc_flags: always sed CFLAGS whether pre-set or not

Browse Source 
Needed for F36 https://fedoraproject.org/wiki/Changes/SetBuildFlagsBuildCheck
This commit is contained in:
Jens Petersen 2022-02-12 14:13:10 +08:00
parent 9a341be0e1
commit b47d44f086
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ghc-rpm-macros.spec
View File

@ -7,7 +7,7 @@
%endif %endif
Name: ghc-rpm-macros Name: ghc-rpm-macros
Version: 2.3.13 Version: 2.3.14
Release: 1%{?dist} Release: 1%{?dist}
Summary: RPM macros for building Haskell packages for GHC Summary: RPM macros for building Haskell packages for GHC
@ -184,6 +184,10 @@ EOF
%changelog %changelog
* Sat Feb 12 2022 Jens Petersen <petersen@redhat.com> - 2.3.14-1
- ghc_set_gcc_flags: also sed CFLAGS when preset in F36
because of https://fedoraproject.org/wiki/Changes/SetBuildFlagsBuildCheck
* Tue Feb 8 2022 Jens Petersen <petersen@redhat.com> - 2.3.13-1 * Tue Feb 8 2022 Jens Petersen <petersen@redhat.com> - 2.3.13-1
- ghc_set_gcc_flags: disable _lto_cflags for all archs - ghc_set_gcc_flags: disable _lto_cflags for all archs
to address missing symbol linking errors across packages to address missing symbol linking errors across packages

2
macros.ghc
View File

@ -14,7 +14,7 @@ LANG=C.utf8\
%global _lto_cflags %{nil}\ %global _lto_cflags %{nil}\
# -Wunused-label is extremely noisy\ # -Wunused-label is extremely noisy\
%ifarch s390x\ %ifarch s390x\
CFLAGS="${CFLAGS:-$(echo %optflags | sed -e 's/-Wall //' -e 's/-Werror=format-security //')}"\ CFLAGS="$(echo ${CFLAGS:-%optflags} | sed -e 's/-Wall //' -e 's/-Werror=format-security //')"\
%else\ %else\
CFLAGS="${CFLAGS:-%optflags}"\ CFLAGS="${CFLAGS:-%optflags}"\
%endif\ %endif\