Compare commits

..

1 Commits

Author SHA1 Message Date
84f0d10ee6
Add riscv64 to ghc_unregisterized_arches
Signed-off-by: David Abdurachmanov <david.abdurachmanov@sifive.com>
2020-12-02 09:20:16 +02:00

View File

@ -41,7 +41,7 @@
%global llvm_major 7.0 %global llvm_major 7.0
%global ghc_llvm_archs armv7hl aarch64 %global ghc_llvm_archs armv7hl aarch64
%global ghc_unregisterized_arches s390 s390x %{mips} %global ghc_unregisterized_arches s390 s390x %{mips} riscv64
Name: ghc Name: ghc
Version: 8.8.4 Version: 8.8.4
@ -49,7 +49,7 @@ Version: 8.8.4
# - release can only be reset if *all* library versions get bumped simultaneously # - release can only be reset if *all* library versions get bumped simultaneously
# (sometimes after a major release) # (sometimes after a major release)
# - minor release numbers for a branch should be incremented monotonically # - minor release numbers for a branch should be incremented monotonically
Release: 108%{?dist} Release: 107.0.riscv64%{?dist}
Summary: Glasgow Haskell Compiler Summary: Glasgow Haskell Compiler
License: BSD and HaskellReport License: BSD and HaskellReport
@ -125,7 +125,11 @@ BuildRequires: python3
BuildRequires: python3-sphinx BuildRequires: python3-sphinx
%endif %endif
%ifarch %{ghc_llvm_archs} %ifarch %{ghc_llvm_archs}
%if 0%{?fedora} > 29
BuildRequires: llvm%{llvm_major} BuildRequires: llvm%{llvm_major}
%else
BuildRequires: llvm >= %{llvm_major}
%endif
%endif %endif
%if %{with dwarf} %if %{with dwarf}
BuildRequires: elfutils-devel BuildRequires: elfutils-devel
@ -185,7 +189,11 @@ Requires: ghc-base-devel%{?_isa} = %{base_ver}-%{release}
Obsoletes: ghc-doc-index < %{version}-%{release} Obsoletes: ghc-doc-index < %{version}-%{release}
%endif %endif
%ifarch %{ghc_llvm_archs} %ifarch %{ghc_llvm_archs}
%if 0%{?fedora} >= 29
Requires: llvm%{llvm_major} Requires: llvm%{llvm_major}
%else
Requires: llvm >= %{llvm_major}
%endif
%endif %endif
%description compiler %description compiler
@ -383,7 +391,12 @@ EOF
autoreconf autoreconf
%endif %endif
%if 0%{?fedora} > 28
%ghc_set_gcc_flags %ghc_set_gcc_flags
%else
export CFLAGS="${CFLAGS:-%optflags}"
export LDFLAGS="${LDFLAGS:-%{?__global_ldflags}}"
%endif
# for ghc >= 8.2 # for ghc >= 8.2
export CC=%{_bindir}/gcc export CC=%{_bindir}/gcc
@ -657,8 +670,8 @@ env -C %{ghc_html_libraries_dir} ./gen_contents_index
%changelog %changelog
* Tue Aug 18 2020 Troy Dawson <tdawson@redhat.com> - 8.8.4-108 * Wed Dec 2 2020 David Abdurachmanov <david.abdurachmanov@sifive.com> - 8.8.4-107.0.riscv64
- Cleanup old %if statements - Add riscv64 to ghc_unregisterized_arches
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 8.8.4-107 * Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 8.8.4-107
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild