From c4bf9572b78e7543c7158abb778f22fab16b77eddc6ae3430ac090a9d20ad3ad Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 2 Feb 2023 14:52:33 +0000 Subject: [PATCH] osc copypac from project:devel:languages:haskell:ghc-9.4.x package:ghc-bootstrap revision:3, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-bootstrap?expand=0&rev=88 --- ghc-bootstrap.changes | 25 +++++++++++++++++++++++++ ghc-bootstrap.spec | 10 +++++++++- 2 files changed, 34 insertions(+), 1 deletion(-) diff --git a/ghc-bootstrap.changes b/ghc-bootstrap.changes index 51095a4..b04fa79 100644 --- a/ghc-bootstrap.changes +++ b/ghc-bootstrap.changes @@ -1,3 +1,28 @@ +------------------------------------------------------------------- +Thu Feb 2 14:27:08 UTC 2023 - Peter Simons + +- Update bootstrap compiler to ghc-8.10.7. + +------------------------------------------------------------------- +Thu Jan 19 12:39:27 UTC 2023 - Guillaume GARDET + +- Do not require unversionned llvm since ghc needs a specific + llvm version. [boo#1207265] + +------------------------------------------------------------------- +Thu Dec 1 16:43:06 UTC 2022 - Peter Simons + +- Explictly depend on libffi8 to make sure we're getting the + correct version of the libffi shared library. [jsc#PED-1151] + +------------------------------------------------------------------- +Fri Jun 24 07:13:19 UTC 2022 - Guillaume GARDET + +- Remove dependency on binutils-gold which have been removed from + Factory +- Allow a newer llvm to be used since llvm9 has been removed from + Factory + ------------------------------------------------------------------- Fri Feb 11 08:40:15 UTC 2022 - Peter Simons diff --git a/ghc-bootstrap.spec b/ghc-bootstrap.spec index a0f6161..df3ebdc 100644 --- a/ghc-bootstrap.spec +++ b/ghc-bootstrap.spec @@ -15,6 +15,12 @@ # Please submit bugfixes or comments via https://bugs.opensuse.org/ # +# Keep in sync with ghc.spec +%if 0%{suse_version} > 1550 +%global llvm_major 12 +%else +%global llvm_major 9 +%endif %ifarch ppc %define longarch powerpc @@ -71,9 +77,11 @@ BuildRequires: fdupes BuildRequires: gmp-devel BuildRequires: libncurses5 BuildRequires: pkgconfig(libffi) +BuildRequires: libffi8 >= 3.4.4 Requires: gmp-devel Requires: libncurses5 Requires: pkgconfig(libffi) +Requires: libffi8 >= 3.4.4 # This package is not meant to be used outside OBS Requires: this-is-only-for-build-envs Provides: ghc-bootstrap-devel @@ -90,7 +98,7 @@ Release: 0 BuildRequires: libnuma-devel %endif %ifarch aarch64 riscv64 -Requires: llvm12 +Requires: llvm%{llvm_major} %endif %ifnarch %{arm} s390x Requires: libffi-devel