pool/ghc
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 534523 from home:ptrommler:branches:devel:languages:haskell

Browse Source 
- add D4089.patch
  * fix GHCi issue on ppc64
  * see Haskell Trac #11262

OBS-URL: https://build.opensuse.org/request/show/534523
OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc?expand=0&rev=252
This commit is contained in:
Peter Simons 2017-10-17 18:44:22 +00:00 committed by Git OBS Bridge
parent d841d24b98
commit 08cc33e6af
3 changed files with 33 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
D4089.patch Normal file
View File

@ -0,0 +1,23 @@
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)

7
ghc.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue Oct 17 09:54:11 UTC 2017 - ptrommler@icloud.com
- add D4089.patch
* fix GHCi issue on ppc64
* see Haskell Trac #11262
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Sep 22 07:57:10 UTC 2017 - ptrommler@icloud.com Fri Sep 22 07:57:10 UTC 2017 - ptrommler@icloud.com

3
ghc.spec
View File

@ -80,6 +80,8 @@ Patch31: ghc-pie.patch
Patch32: 0001-PPC-Implement-Atomic-operations.patch Patch32: 0001-PPC-Implement-Atomic-operations.patch
# PATCH-FIX-UPSTREAM 0001-Use-__atomic-intrinsics-for-atomicread-write.patch ptrommler@icloud.com -- 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. # PATCH-FIX-UPSTREAM 0001-Use-__atomic-intrinsics-for-atomicread-write.patch ptrommler@icloud.com -- 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 Patch33: 0001-Use-__atomic-intrinsics-for-atomicread-write.patch
# PATCH-FIX-UPSTREAM D4089.patch ptrommler@icloud.com -- 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. # PATCH-FIX-OPENSUSE ghc-8.0.2-Cabal-dynlibdir.patch -- Fix shared library directory location.
Patch100: ghc-8.0.2-Cabal-dynlibdir.patch Patch100: ghc-8.0.2-Cabal-dynlibdir.patch
# PATCH-FIX-UPSTREAM buildpath-abi-stability.patch -- debian patch for more stable abi-1 # PATCH-FIX-UPSTREAM buildpath-abi-stability.patch -- debian patch for more stable abi-1
@ -177,6 +179,7 @@ except the ghc library, which is installed by the toplevel ghc metapackage.
%patch31 -p1 %patch31 -p1
%patch32 -p1 %patch32 -p1
%patch33 -p1 %patch33 -p1
%patch34 -p1
%patch100 -p1 %patch100 -p1
%patch110 -p1 %patch110 -p1
%patch111 -p1 %patch111 -p1