diff --git a/ghc-tasty.changes b/ghc-tasty.changes index 19af08a..5809462 100644 --- a/ghc-tasty.changes +++ b/ghc-tasty.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Jul 19 19:57:20 UTC 2024 - Christian Boltz + +- extend riscv64-unbounded-delays.patch to not depend on + unbounded-delays on ppc64 and s390x + ------------------------------------------------------------------- Thu Jul 18 10:57:07 UTC 2024 - Peter Simons diff --git a/ghc-tasty.spec b/ghc-tasty.spec index 6f93690..c63dc46 100644 --- a/ghc-tasty.spec +++ b/ghc-tasty.spec @@ -26,7 +26,9 @@ License: MIT URL: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz Source1: https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/2.cabal#/%{pkg_name}.cabal -# https://github.com/UnkindPartition/tasty/pull/371 +# https://github.com/UnkindPartition/tasty/pull/371 (riscv64) +# https://github.com/UnkindPartition/tasty/pull/422 (s390x, merged upstream) +# https://github.com/UnkindPartition/tasty/pull/423 (ppc64, merged upstream) Patch0: riscv64-unbounded-delays.patch BuildRequires: ghc-Cabal-devel BuildRequires: ghc-ansi-terminal-devel diff --git a/riscv64-unbounded-delays.patch b/riscv64-unbounded-delays.patch index ae7cfc4..23ac913 100644 --- a/riscv64-unbounded-delays.patch +++ b/riscv64-unbounded-delays.patch @@ -5,7 +5,7 @@ -- No reason to depend on unbounded-delays on 64-bit architecture - if(!arch(x86_64) && !arch(aarch64)) -+ if(!arch(x86_64) && !arch(aarch64) && !arch(riscv64)) ++ if(!arch(x86_64) && !arch(aarch64) && !arch(ppc64) && !arch(riscv64) && !arch(s390x)) build-depends: unbounded-delays >= 0.1 && < 0.2