[ghc-chalmers-lava2000] fix up haskell98 build issues for ghc74
Jens Petersen
petersen at fedoraproject.org
Wed Apr 11 10:02:59 UTC 2012
commit 7462d6fb92042fc2c74509b5274f98b2ea27101c
Author: Jens Petersen <petersen at redhat.com>
Date: Wed Apr 11 19:02:52 2012 +0900
fix up haskell98 build issues for ghc74
chalmers-lava2000-1.1.2-ghc74-haskell98.patch | 133 +++++++++++++++++++++++++
ghc-chalmers-lava2000.spec | 7 +-
2 files changed, 139 insertions(+), 1 deletions(-)
---
diff --git a/chalmers-lava2000-1.1.2-ghc74-haskell98.patch b/chalmers-lava2000-1.1.2-ghc74-haskell98.patch
new file mode 100644
index 0000000..d6863c3
--- /dev/null
+++ b/chalmers-lava2000-1.1.2-ghc74-haskell98.patch
@@ -0,0 +1,133 @@
+diff -up chalmers-lava2000-1.1.2/chalmers-lava2000.cabal~ chalmers-lava2000-1.1.2/chalmers-lava2000.cabal
+--- chalmers-lava2000-1.1.2/chalmers-lava2000.cabal~ 2012-04-11 13:39:14.603999998 +0900
++++ chalmers-lava2000-1.1.2/chalmers-lava2000.cabal 2012-04-11 18:54:08.303002437 +0900
+@@ -44,7 +44,7 @@ library
+ other-modules:
+ Paths_chalmers_lava2000
+
+- build-Depends: base >= 3 && < 5, haskell98 >= 1 && < 3, process >= 1 && < 2
++ build-Depends: base >= 3 && < 5, process >= 1 && < 2, random
+
+ extensions: Rank2Types, ExistentialQuantification
+ ghc-options: -fno-warn-overlapping-patterns -fno-warn-missing-methods
+diff -up chalmers-lava2000-1.1.2/Lava/ConstructiveAnalysis.hs~ chalmers-lava2000-1.1.2/Lava/ConstructiveAnalysis.hs
+--- chalmers-lava2000-1.1.2/Lava/ConstructiveAnalysis.hs~ 2011-04-27 01:24:01.000000000 +0900
++++ chalmers-lava2000-1.1.2/Lava/ConstructiveAnalysis.hs 2012-04-11 18:50:53.700001635 +0900
+@@ -17,7 +17,7 @@ import Lava.MyST
+ , unsafeInterleaveST
+ )
+
+-import List
++import Data.List
+ ( isPrefixOf
+ )
+
+diff -up chalmers-lava2000-1.1.2/Lava/Generic.hs~ chalmers-lava2000-1.1.2/Lava/Generic.hs
+--- chalmers-lava2000-1.1.2/Lava/Generic.hs~ 2011-04-27 01:24:01.000000000 +0900
++++ chalmers-lava2000-1.1.2/Lava/Generic.hs 2012-04-11 18:51:04.672997527 +0900
+@@ -10,7 +10,7 @@ import Lava.LavaRandom
+ , next
+ )
+
+-import List
++import Data.List
+ ( transpose
+ )
+
+diff -up chalmers-lava2000-1.1.2/Lava/IOBuffering.hs~ chalmers-lava2000-1.1.2/Lava/IOBuffering.hs
+--- chalmers-lava2000-1.1.2/Lava/IOBuffering.hs~ 2011-04-27 01:24:01.000000000 +0900
++++ chalmers-lava2000-1.1.2/Lava/IOBuffering.hs 2012-04-11 18:51:22.730992301 +0900
+@@ -1,6 +1,6 @@
+ module Lava.IOBuffering where
+
+-import IO
++import System.IO
+ ( hSetBuffering
+ , stdout
+ , BufferMode(..)
+diff -up chalmers-lava2000-1.1.2/Lava/LavaRandom.hs~ chalmers-lava2000-1.1.2/Lava/LavaRandom.hs
+--- chalmers-lava2000-1.1.2/Lava/LavaRandom.hs~ 2011-04-27 01:24:01.000000000 +0900
++++ chalmers-lava2000-1.1.2/Lava/LavaRandom.hs 2012-04-11 18:52:13.376998109 +0900
+@@ -6,7 +6,7 @@ module Lava.LavaRandom
+ )
+ where
+
+-import Random
++import System.Random
+ ( StdGen
+ , newStdGen
+ , next
+diff -up chalmers-lava2000-1.1.2/Lava/Property.hs~ chalmers-lava2000-1.1.2/Lava/Property.hs
+--- chalmers-lava2000-1.1.2/Lava/Property.hs~ 2011-04-27 01:24:01.000000000 +0900
++++ chalmers-lava2000-1.1.2/Lava/Property.hs 2012-04-11 18:54:58.471998733 +0900
+@@ -22,14 +22,14 @@ module Lava.Property
+ import Lava.Signal
+ import Lava.Generic
+
+-import Monad
++import Control.Monad
+ ( liftM2
+ , liftM3
+ , liftM4
+ , liftM5
+ )
+
+-import List
++import Data.List
+ ( intersperse
+ , transpose
+ )
+diff -up chalmers-lava2000-1.1.2/Lava/Retime.hs~ chalmers-lava2000-1.1.2/Lava/Retime.hs
+--- chalmers-lava2000-1.1.2/Lava/Retime.hs~ 2011-04-27 01:24:01.000000000 +0900
++++ chalmers-lava2000-1.1.2/Lava/Retime.hs 2012-04-11 18:55:06.137000618 +0900
+@@ -8,7 +8,7 @@ import Lava.Generic
+ import Lava.Sequent
+ import Lava.Netlist
+
+-import List
++import Data.List
+ ( isPrefixOf
+ )
+
+diff -up chalmers-lava2000-1.1.2/Lava/Signal.hs~ chalmers-lava2000-1.1.2/Lava/Signal.hs
+--- chalmers-lava2000-1.1.2/Lava/Signal.hs~ 2011-04-27 01:24:01.000000000 +0900
++++ chalmers-lava2000-1.1.2/Lava/Signal.hs 2012-04-11 18:55:13.610001764 +0900
+@@ -4,7 +4,7 @@ import Lava.Ref
+ import Lava.Sequent
+ import Lava.Error
+
+-import List
++import Data.List
+ ( transpose
+ )
+
+diff -up chalmers-lava2000-1.1.2/Lava/Stable.hs~ chalmers-lava2000-1.1.2/Lava/Stable.hs
+--- chalmers-lava2000-1.1.2/Lava/Stable.hs~ 2011-04-27 01:24:01.000000000 +0900
++++ chalmers-lava2000-1.1.2/Lava/Stable.hs 2012-04-11 18:55:20.769998196 +0900
+@@ -15,7 +15,7 @@ import Lava.MyST
+ , unsafeInterleaveST
+ )
+
+-import List
++import Data.List
+ ( isPrefixOf
+ )
+
+diff -up chalmers-lava2000-1.1.2/Lava/Vhdl.hs~ chalmers-lava2000-1.1.2/Lava/Vhdl.hs
+--- chalmers-lava2000-1.1.2/Lava/Vhdl.hs~ 2011-04-27 01:24:01.000000000 +0900
++++ chalmers-lava2000-1.1.2/Lava/Vhdl.hs 2012-04-11 18:55:42.609997947 +0900
+@@ -12,12 +12,12 @@ import Lava.Sequent
+ import Lava.Error
+ import Lava.LavaDir
+
+-import List
++import Data.List
+ ( intersperse
+ , nub
+ )
+
+-import IO
++import System.IO
+ ( openFile
+ , IOMode(..)
+ , hPutStr
diff --git a/ghc-chalmers-lava2000.spec b/ghc-chalmers-lava2000.spec
index fbcf529..6702e63 100644
--- a/ghc-chalmers-lava2000.spec
+++ b/ghc-chalmers-lava2000.spec
@@ -10,7 +10,7 @@
Name: ghc-%{pkg_name}
Version: 1.1.2
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: %{common_summary}
Group: System Environment/Libraries
@@ -26,6 +26,7 @@ Source1: README.fedora
BuildRequires: ghc-haskell98-prof
Patch0: ghc-chalmers-lava2000-remove-verification-modules.patch
Patch1: chalmers-lava2000-1.1.2-haskell98.patch
+Patch2: chalmers-lava2000-1.1.2-ghc74-haskell98.patch
%description
%{common_description}
@@ -35,6 +36,7 @@ Patch1: chalmers-lava2000-1.1.2-haskell98.patch
%setup -q -n %{pkg_name}-%{version}
%patch0 -p1 -b .orig
%patch1 -p1 -b .haskell98
+%patch2 -p1 -b .ghc74
%{__install} -pm 644 %{SOURCE1} .
@@ -65,6 +67,9 @@ echo "%doc tutorial.ps.gz" >> %{name}-doc.files
%changelog
+* Wed Apr 11 2012 Jens Petersen <petersen at redhat.com> - 1.1.2-4
+- fix up haskell98 build issues for ghc74
+
* Sat Mar 24 2012 Jens Petersen <petersen at redhat.com> - 1.1.2-3
- update to cabal2spec-0.25
- bump haskell98 upperbound for ghc-7.4
More information about the scm-commits
mailing list