From 74888983bc303e0b75f4ad7cd8e0e14610fbeb04 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 9 Jan 2018 20:29:53 +0900 Subject: [PATCH] patch around test rts -N4 failure on s390x and aarch64 --- extra-No-test--N.patch | 11 +++++++++++ ghc-extra.spec | 6 +++++- 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 extra-No-test--N.patch diff --git a/extra-No-test--N.patch b/extra-No-test--N.patch new file mode 100644 index 0000000..2431b00 --- /dev/null +++ b/extra-No-test--N.patch @@ -0,0 +1,11 @@ +--- extra-1.5.3/extra.cabal~ 2017-06-13 06:58:38.000000000 +0900 ++++ extra-1.5.3/extra.cabal 2018-01-09 20:24:52.221337034 +0900 +@@ -74,7 +74,7 @@ + if !os(windows) + build-depends: unix + hs-source-dirs: test +- ghc-options: -main-is Test -threaded "-with-rtsopts=-N4 -K1K" ++ ghc-options: -main-is Test -threaded "-with-rtsopts=-K1K" + main-is: Test.hs + other-modules: + TestCustom diff --git a/ghc-extra.spec b/ghc-extra.spec index 27f5ecd..47098fb 100644 --- a/ghc-extra.spec +++ b/ghc-extra.spec @@ -14,6 +14,7 @@ Summary: Extra Haskell functions License: BSD Url: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz +Patch0: extra-No-test--N.patch BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros @@ -58,7 +59,9 @@ This package provides the Haskell %{pkg_name} library development files. %prep %setup -q -n %{pkgver} - +%ifarch aarch64 s390x +%patch0 -p1 -b .orig +%endif %build %ghc_lib_build @@ -91,3 +94,4 @@ This package provides the Haskell %{pkg_name} library development files. %changelog * Thu Dec 21 2017 Jens Petersen - 1.5.3-1 - spec file generated by cabal-rpm-0.12 +- test RTS -N4 failing on aarch64 and s390x