From adcc58afdc80caaff319732be244b2f3097823ce Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 7 Mar 2016 23:20:16 +0900 Subject: [PATCH] drop %ghc_arches_with_ghci --- ghc-vector.spec | 5 ----- vector-debian-no_ann_without_ghci.patch | 24 ------------------------ 2 files changed, 29 deletions(-) delete mode 100644 vector-debian-no_ann_without_ghci.patch diff --git a/ghc-vector.spec b/ghc-vector.spec index c8f0d77..12b55be 100644 --- a/ghc-vector.spec +++ b/ghc-vector.spec @@ -11,7 +11,6 @@ Summary: Efficient Arrays License: BSD Url: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz -Patch1: vector-debian-no_ann_without_ghci.patch BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros @@ -39,10 +38,6 @@ This package provides the Haskell %{pkg_name} library development files. %prep %setup -q -n %{pkg_name}-%{version} -# Monad.hs fails on ppc too -%ifnarch %(echo %{ghc_arches_with_ghci} | sed -e s/ppc//) -%patch1 -p1 -b .orig -%endif %build diff --git a/vector-debian-no_ann_without_ghci.patch b/vector-debian-no_ann_without_ghci.patch deleted file mode 100644 index 21582db..0000000 --- a/vector-debian-no_ann_without_ghci.patch +++ /dev/null @@ -1,24 +0,0 @@ - http://hackage.haskell.org/trac/ghc/ticket/4268 - ---- haskell-vector-0.9.1.orig/Data/Vector/Fusion/Stream/Monadic.hs 2012-02-10 23:48:51.000000000 +0100 -+++ haskell-vector-0.9.1/Data/Vector/Fusion/Stream/Monadic.hs 2012-02-10 23:49:04.000000000 +0100 -@@ -94,15 +94,19 @@ - import Data.Word ( Word8, Word16, Word32, Word, Word64 ) - - #if __GLASGOW_HASKELL__ >= 700 -+#if 0 - import GHC.Exts ( SpecConstrAnnotation(..) ) - #endif -+#endif - - #include "vector.h" - - data SPEC = SPEC | SPEC2 - #if __GLASGOW_HASKELL__ >= 700 -+#if 0 - {-# ANN type SPEC ForceSpecConstr #-} - #endif -+#endif - - emptyStream :: String - {-# NOINLINE emptyStream #-}