[Git][haskell-team/DHG_packages][master] 2 commits: Revert "ghc: enable unregisterised builds on armhf"

[Ilias Tsitsimpis (@iliastsi)]

Ilias Tsitsimpis pushed to branch master at Debian Haskell Group / DHG_packages


Commits:
3c7a30ce by Ilias Tsitsimpis at 2022-09-24T09:54:56+03:00
Revert "ghc: enable unregisterised builds on armhf"

This reverts commit 103362db9ced6cf43eb2464d954db6956c8cb4b2.
Registerised GHC seems to be working just fine on armhf in Debian, so
keeping it as is.

- - - - -
9b13d7c7 by Ilias Tsitsimpis at 2022-09-24T10:06:24+03:00
ghc: Fix ABI reproducibility

- - - - -


4 changed files:

- p/ghc/debian/changelog
- + p/ghc/debian/patches/buildpath-abi-stability-2.patch
- p/ghc/debian/patches/series
- p/ghc/debian/rules


Changes:

=====================================
p/ghc/debian/changelog
=====================================
@@ -1,3 +1,9 @@
+ghc (9.0.2-4) unstable; urgency=medium
+
+  * Backport patch to fix ABI reproducibility (Closes: #1015733)
+
+ -- Ilias Tsitsimpis <iliastsi at debian.org>  Sat, 24 Sep 2022 10:06:11 +0300
+
 ghc (9.0.2-3) unstable; urgency=medium
 
   * Declare compliance with Debian policy 4.6.1


=====================================
p/ghc/debian/patches/buildpath-abi-stability-2.patch
=====================================
@@ -0,0 +1,87 @@
+Description: Don't include BufPos in interface files
+Author: Matthew Pickering
+Origin: https://gitlab.haskell.org/ghc/ghc/-/merge_requests/8972
+Bug: https://gitlab.haskell.org/ghc/ghc/-/issues/22162
+Index: b/compiler/GHC/Iface/Ext/Types.hs
+===================================================================
+--- a/compiler/GHC/Iface/Ext/Types.hs
++++ b/compiler/GHC/Iface/Ext/Types.hs
+@@ -746,5 +746,5 @@ toHieName name
+   | isKnownKeyName name = KnownKeyName (nameUnique name)
+   | isExternalName name = ExternalName (nameModule name)
+                                        (nameOccName name)
+-                                       (nameSrcSpan name)
+-  | otherwise = LocalName (nameOccName name) (nameSrcSpan name)
++                                       (removeBufSpan $ nameSrcSpan name)
++  | otherwise = LocalName (nameOccName name) (removeBufSpan $ nameSrcSpan name)
+Index: b/compiler/GHC/Types/SrcLoc.hs
+===================================================================
+--- a/compiler/GHC/Types/SrcLoc.hs
++++ b/compiler/GHC/Types/SrcLoc.hs
+@@ -72,6 +72,7 @@ module GHC.Types.SrcLoc (
+         getBufPos,
+         BufSpan(..),
+         getBufSpan,
++        removeBufSpan,
+ 
+         -- * Located
+         Located,
+@@ -397,6 +398,10 @@ data UnhelpfulSpanReason
+   | UnhelpfulOther !FastString
+   deriving (Eq, Show)
+ 
++removeBufSpan :: SrcSpan -> SrcSpan
++removeBufSpan (RealSrcSpan s _) = RealSrcSpan s Nothing
++removeBufSpan s = s
++
+ {- Note [Why Maybe BufPos]
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~
+ In SrcLoc we store (Maybe BufPos); in SrcSpan we store (Maybe BufSpan).
+Index: b/compiler/GHC/Utils/Binary.hs
+===================================================================
+--- a/compiler/GHC/Utils/Binary.hs
++++ b/compiler/GHC/Utils/Binary.hs
+@@ -1444,19 +1444,6 @@ instance Binary RealSrcSpan where
+             return (mkRealSrcSpan (mkRealSrcLoc f sl sc)
+                                   (mkRealSrcLoc f el ec))
+ 
+-instance Binary BufPos where
+-  put_ bh (BufPos i) = put_ bh i
+-  get bh = BufPos <$> get bh
+-
+-instance Binary BufSpan where
+-  put_ bh (BufSpan start end) = do
+-    put_ bh start
+-    put_ bh end
+-  get bh = do
+-    start <- get bh
+-    end <- get bh
+-    return (BufSpan start end)
+-
+ instance Binary UnhelpfulSpanReason where
+   put_ bh r = case r of
+     UnhelpfulNoLocationInfo -> putByte bh 0
+@@ -1475,10 +1462,11 @@ instance Binary UnhelpfulSpanReason wher
+       _ -> UnhelpfulOther <$> get bh
+ 
+ instance Binary SrcSpan where
+-  put_ bh (RealSrcSpan ss sb) = do
++  put_ bh (RealSrcSpan ss _sb) = do
+           putByte bh 0
++          -- BufSpan doesn't ever get serialised because the positions depend
++          -- on build location.
+           put_ bh ss
+-          put_ bh sb
+ 
+   put_ bh (UnhelpfulSpan s) = do
+           putByte bh 1
+@@ -1488,8 +1476,7 @@ instance Binary SrcSpan where
+           h <- getByte bh
+           case h of
+             0 -> do ss <- get bh
+-                    sb <- get bh
+-                    return (RealSrcSpan ss sb)
++                    return (RealSrcSpan ss Nothing)
+             _ -> do s <- get bh
+                     return (UnhelpfulSpan s)
+ 


=====================================
p/ghc/debian/patches/series
=====================================
@@ -2,6 +2,7 @@ use-debian-gen_contents_index
 ARM-VFPv3D16
 no-missing-haddock-file-warning
 buildpath-abi-stability.patch
+buildpath-abi-stability-2.patch
 x32-use-native-x86_64-insn.patch
 use-stage1-binaries-for-install.patch
 kfreebsd-aclocal.m4


=====================================
p/ghc/debian/rules
=====================================
@@ -39,7 +39,7 @@ export GHC=$(firstword $(shell bash -c "type -p ghc"))
 
 DEB_HOOGLE_TXT_DIR = /usr/lib/ghc-doc/hoogle/
 
-ifneq (,$(filter armhf i386 powerpcspe x32 s390x, $(DEB_HOST_ARCH)))
+ifneq (,$(filter i386 powerpcspe x32 s390x, $(DEB_HOST_ARCH)))
   # From GHC 8.10 and later, native code generator support for legacy x87
   # floating point coprocessor has been removed. GHC now only support floating
   # point via SSE2. This causes a baseline violation on Debian for i386 where



View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/compare/beac52b16ee8638426477fa07e59f94143dd8b1f...9b13d7c7b89f44b816c2e88cf4ce244faaff8713

-- 
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/compare/beac52b16ee8638426477fa07e59f94143dd8b1f...9b13d7c7b89f44b816c2e88cf4ce244faaff8713
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-haskell-commits/attachments/20220924/653ab95d/attachment-0001.htm>