rpm/ghc-tasty
SHA256
1
0
Fork 0
forked from pool/ghc-tasty
Code Pull Requests Activity

Accepting request 1102053 from home:Andreas_Schwab:riscv:ghc

Browse Source 
- riscv64-unbounded-delays.patch: Don't depend on unbounded-delays for
  riscv64

OBS-URL: https://build.opensuse.org/request/show/1102053
OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-tasty?expand=0&rev=17
This commit is contained in:
Peter Simons 2023-08-04 17:07:34 +00:00 committed by Git OBS Bridge
parent 0cf4196ddb
commit 4c60456568
3 changed files with 36 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ghc-tasty.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Aug 2 17:23:04 UTC 2023 - Andreas Schwab <schwab@suse.de>
- riscv64-unbounded-delays.patch: Don't depend on unbounded-delays for
riscv64
-------------------------------------------------------------------
Thu Mar 30 17:08:30 UTC 2023 - Peter Simons <psimons@suse.com>

8
ghc-tasty.spec
View File

@ -1,5 +1,5 @@
#
# spec file for package ghc-tasty
# spec file
#
# Copyright (c) 2023 SUSE LLC
#
@ -25,6 +25,8 @@ Summary: Modern and extensible testing framework
License: MIT
URL: https://hackage.haskell.org/package/%{pkg_name}
Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz
# https://github.com/UnkindPartition/tasty/pull/371
Patch0: riscv64-unbounded-delays.patch
BuildRequires: ghc-Cabal-devel
BuildRequires: ghc-ansi-terminal-devel
BuildRequires: ghc-ansi-terminal-prof
@ -55,7 +57,7 @@ Summary: Haskell %{pkg_name} library development files
Requires: %{name} = %{version}-%{release}
Requires: ghc-compiler = %{ghc_version}
Requires(post): ghc-compiler = %{ghc_version}
Requires(postun): ghc-compiler = %{ghc_version}
Requires(postun):ghc-compiler = %{ghc_version}
%description devel
This package provides the Haskell %{pkg_name} library development files.
@ -77,7 +79,7 @@ Supplements: (ghc-%{pkg_name}-devel and ghc-prof)
This package provides the Haskell %{pkg_name} profiling library.
%prep
%autosetup -n %{pkg_name}-%{version}
%autosetup -n %{pkg_name}-%{version} -p1
%build
%ghc_lib_build

25
riscv64-unbounded-delays.patch Normal file
View File

@ -0,0 +1,25 @@
From 65da3d6512ee2f8c53d2bbde840456749c5038c8 Mon Sep 17 00:00:00 2001
From: Felix Yan <felixonmars@archlinux.org>
Date: Thu, 22 Jun 2023 08:21:17 +0300
Subject: [PATCH] Don't depend on unbounded-delays for riscv64
64-bit RISC-V should fall into the same case in
https://github.com/UnkindPartition/tasty/pull/344 and should be added
here. Tested locally.
---
core/tasty.cabal | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: tasty-1.4.3/tasty.cabal
===================================================================
--- tasty-1.4.3.orig/tasty.cabal
+++ tasty-1.4.3/tasty.cabal
@@ -68,7 +68,7 @@ library
ansi-terminal >= 0.9
-- 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))
build-depends:
unbounded-delays >= 0.1