Set LD_STAGE0, AR_STAGE0; Remove BR for ghc*

Signed-off-by: David Abdurachmanov <david.abdurachmanov@gmail.com>
This commit is contained in:
David Abdurachmanov 2018-10-24 22:59:51 +02:00
parent 86dcdd1d13
commit 92f668b74e
Signed by: davidlt
GPG Key ID: 7108702C938B13C1
1 changed files with 13 additions and 11 deletions

View File

@ -46,7 +46,7 @@ Version: 8.2.2
# - release can only be reset if *all* library versions get bumped simultaneously
# (sometimes after a major release)
# - minor release numbers for a branch should be incremented monotonically
Release: 70.0.riscv64%{?dist}
Release: 70.2.riscv64%{?dist}
Summary: Glasgow Haskell Compiler
License: BSD and HaskellReport
@ -90,18 +90,18 @@ Patch40: ghc-8.2.20-riscv.patch
# and retired arches: alpha sparcv9 armv5tel
# see also deprecated ghc_arches defined in /etc/rpm/macros.ghc-srpm by redhat-rpm-macros
BuildRequires: ghc-compiler
#BuildRequires: ghc-compiler
# for ABI hash checking
%if %{with abicheck}
BuildRequires: ghc
#BuildRequires: ghc
%endif
BuildRequires: ghc-rpm-macros-extra >= 1.8
BuildRequires: ghc-binary-devel
BuildRequires: ghc-bytestring-devel
BuildRequires: ghc-containers-devel
BuildRequires: ghc-directory-devel
BuildRequires: ghc-pretty-devel
BuildRequires: ghc-process-devel
#BuildRequires: ghc-rpm-macros-extra >= 1.8
#BuildRequires: ghc-binary-devel
#BuildRequires: ghc-bytestring-devel
#BuildRequires: ghc-containers-devel
#BuildRequires: ghc-directory-devel
#BuildRequires: ghc-pretty-devel
#BuildRequires: ghc-process-devel
BuildRequires: gmp-devel
BuildRequires: libffi-devel
# for terminfo
@ -363,6 +363,8 @@ export LDFLAGS="${LDFLAGS:-%{?__global_ldflags}}"
# for ghc >= 8.2
export CC=%{_bindir}/gcc
export CC_STAGE0=%{_bindir}/gcc
export AR_STAGE0=%{_bindir}/ar
export LD_STAGE0=%{_bindir}/ld
# * %%configure induces cross-build due to different target/host/build platform names
./configure --prefix=%{_prefix} --exec-prefix=%{_exec_prefix} \
--bindir=%{_bindir} --sbindir=%{_sbindir} --sysconfdir=%{_sysconfdir} \
@ -658,7 +660,7 @@ fi
%changelog
* Wed Oct 24 2018 David Abdurachmanov <david.abdurachmanov@gmail.com> - 8.2.2-70.0.riscv64
* Wed Oct 24 2018 David Abdurachmanov <david.abdurachmanov@gmail.com> - 8.2.2-70.2.riscv64
- 1st attempt to bootstrap unregistered build for RISC-V (riscv64)
* Wed Oct 17 2018 Jens Petersen <petersen@redhat.com> - 8.2.2-70