BR clang not just llvm for ARM; bootstrap build

This commit is contained in:
Jens Petersen 2012-04-10 11:20:14 +09:00
parent aeeb8ec996
commit 279ebd2aeb

View File

@ -2,10 +2,10 @@
# (disabled for other archs in ghc-rpm-macros) # (disabled for other archs in ghc-rpm-macros)
# To bootstrap a new version of ghc, uncomment the following: # To bootstrap a new version of ghc, uncomment the following:
#%%global ghc_bootstrapping 1 %global ghc_bootstrapping 1
#%%{?ghc_bootstrap} %{?ghc_bootstrap}
#%%global without_hscolour 1 %global without_hscolour 1
#%%global without_testsuite 1 %global without_testsuite 1
# To do a test build instead with shared libs, uncomment the following: # To do a test build instead with shared libs, uncomment the following:
#%%global ghc_bootstrapping 1 #%%global ghc_bootstrapping 1
@ -30,7 +30,7 @@ Version: 7.4.1
# - release can only be reset if all library versions get bumped simultaneously # - release can only be reset if all library versions get bumped simultaneously
# (eg for a major release) # (eg for a major release)
# - minor release numbers should be incremented monotonically # - minor release numbers should be incremented monotonically
Release: 2%{?dist} Release: 1.1%{?dist}
Summary: Glasgow Haskell Compiler Summary: Glasgow Haskell Compiler
# fedora ghc has been bootstrapped on # fedora ghc has been bootstrapped on
# %{ix86} x86_64 ppc alpha sparcv9 ppc64 armv7hl armv5tel s390 s390x # %{ix86} x86_64 ppc alpha sparcv9 ppc64 armv7hl armv5tel s390 s390x
@ -75,7 +75,7 @@ BuildRequires: hscolour
BuildRequires: python BuildRequires: python
%endif %endif
%ifarch armv7hl armv5tel %ifarch armv7hl armv5tel
BuildRequires: llvm >= 3.0 BuildRequires: clang >= 3.0
%endif %endif
Requires: ghc-compiler = %{version}-%{release} Requires: ghc-compiler = %{version}-%{release}
Requires: ghc-libraries = %{version}-%{release} Requires: ghc-libraries = %{version}-%{release}
@ -408,8 +408,9 @@ fi
%files libraries %files libraries
%changelog %changelog
* Wed Mar 21 2012 Jens Petersen <petersen@redhat.com> - 7.4.1-2 * Tue Apr 10 2012 Jens Petersen <petersen@redhat.com> - 7.4.1-1.1
- full build - BR clang not just llvm for ARM
- bootstrap build
* Wed Feb 15 2012 Jens Petersen <petersen@redhat.com> - 7.4.1-1 * Wed Feb 15 2012 Jens Petersen <petersen@redhat.com> - 7.4.1-1
- update to new 7.4.1 major release - update to new 7.4.1 major release