Accepting request 1218531 from devel:languages:haskell

OBS-URL: https://build.opensuse.org/request/show/1218531
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ghc-tasty?expand=0&rev=12
This commit is contained in:
Ana Guerrero 2024-10-28 14:17:54 +00:00 committed by Git OBS Bridge
commit a13c07d801
3 changed files with 10 additions and 2 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Jul 19 19:57:20 UTC 2024 - Christian Boltz <suse-beta@cboltz.de>
- 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 <psimons@suse.com> Thu Jul 18 10:57:07 UTC 2024 - Peter Simons <psimons@suse.com>

View File

@ -26,7 +26,9 @@ License: MIT
URL: https://hackage.haskell.org/package/%{pkg_name} URL: https://hackage.haskell.org/package/%{pkg_name}
Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz 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 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 Patch0: riscv64-unbounded-delays.patch
BuildRequires: ghc-Cabal-devel BuildRequires: ghc-Cabal-devel
BuildRequires: ghc-ansi-terminal-devel BuildRequires: ghc-ansi-terminal-devel

View File

@ -5,7 +5,7 @@
-- No reason to depend on unbounded-delays on 64-bit architecture -- No reason to depend on unbounded-delays on 64-bit architecture
- if(!arch(x86_64) && !arch(aarch64)) - 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: build-depends:
unbounded-delays >= 0.1 && < 0.2 unbounded-delays >= 0.1 && < 0.2