Hello community, here is the log from the commit of package ghc for openSUSE:Factory checked in at 2017-10-19 19:32:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc (Old) and /work/SRC/openSUSE:Factory/.ghc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc" Thu Oct 19 19:32:38 2017 rev:58 rq:534526 version:8.0.2 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc/ghc.changes 2017-10-02 16:53:32.144017121 +0200 +++ /work/SRC/openSUSE:Factory/.ghc.new/ghc.changes 2017-10-19 19:32:38.903440142 +0200 @@ -1,0 +2,7 @@ +Tue Oct 17 09:54:11 UTC 2017 - [email protected] + +- add D4089.patch + * fix GHCi issue on ppc64 + * see Haskell Trac #11262 + +------------------------------------------------------------------- New: ---- D4089.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc.spec ++++++ --- /var/tmp/diff_new_pack.nNiqut/_old 2017-10-19 19:32:39.915392794 +0200 +++ /var/tmp/diff_new_pack.nNiqut/_new 2017-10-19 19:32:39.915392794 +0200 @@ -80,6 +80,8 @@ Patch32: 0001-PPC-Implement-Atomic-operations.patch # PATCH-FIX-UPSTREAM 0001-Use-__atomic-intrinsics-for-atomicread-write.patch [email protected] -- Fix atomic read and atomic write on platforms that have no native code generator nor LLVM backend. This is s390x for openSUSE. See Haskell Trac #14244. Patch33: 0001-Use-__atomic-intrinsics-for-atomicread-write.patch +# PATCH-FIX-UPSTREAM D4089.patch [email protected] -- Fix GHCi on ppc64. See Haskell Trac #11262 +Patch34: D4089.patch # PATCH-FIX-OPENSUSE ghc-8.0.2-Cabal-dynlibdir.patch -- Fix shared library directory location. Patch100: ghc-8.0.2-Cabal-dynlibdir.patch # PATCH-FIX-UPSTREAM buildpath-abi-stability.patch -- debian patch for more stable abi-1 @@ -177,6 +179,7 @@ %patch31 -p1 %patch32 -p1 %patch33 -p1 +%patch34 -p1 %patch100 -p1 %patch110 -p1 %patch111 -p1 ++++++ D4089.patch ++++++ Index: ghc-8.0.2/compiler/ghci/RtClosureInspect.hs =================================================================== --- ghc-8.0.2.orig/compiler/ghci/RtClosureInspect.hs +++ ghc-8.0.2/compiler/ghci/RtClosureInspect.hs @@ -55,6 +55,7 @@ import TysWiredIn import DynFlags import Outputable as Ppr import GHC.Arr ( Array(..) ) +import GHC.Char import GHC.Exts import GHC.IO ( IO(..) ) @@ -495,7 +496,9 @@ cPprTermBase y = repPrim :: TyCon -> [Word] -> SDoc repPrim t = rep where rep x - | t == charPrimTyCon = text $ show (build x :: Char) + -- Char# uses native machine words, whereas Char's Storable instance uses + -- Int32, so we have to read it as an Int. + | t == charPrimTyCon = text $ show (chr (build x :: Int)) | t == intPrimTyCon = text $ show (build x :: Int) | t == wordPrimTyCon = text $ show (build x :: Word) | t == floatPrimTyCon = text $ show (build x :: Float)
