[Git][haskell-team/DHG_packages][experimental] ghc: Add upstream proposed patch to fix a build failure

[Gianfranco Costamagna (@locutusofborg)]

Gianfranco Costamagna pushed to branch experimental at Debian Haskell Group / DHG_packages


Commits:
8349ec0d by Gianfranco Costamagna at 2022-11-29T21:27:25+01:00
ghc: Add upstream proposed patch to fix a build failure

- - - - -


3 changed files:

- p/ghc/debian/changelog
- + p/ghc/debian/patches/build-fix-hs-constants.patch
- p/ghc/debian/patches/series


Changes:

=====================================
p/ghc/debian/changelog
=====================================
@@ -1,3 +1,10 @@
+ghc (9.2.5-1~exp2) experimental; urgency=medium
+
+  * build-fix-hs-constants.patch
+    - cherry-pick upstream proposed fix for build failure.
+
+ -- Gianfranco Costamagna <locutusofborg at debian.org>  Tue, 29 Nov 2022 14:35:58 +0100
+
 ghc (9.2.5-1~exp1) experimental; urgency=medium
 
   * New upstream release.


=====================================
p/ghc/debian/patches/build-fix-hs-constants.patch
=====================================
@@ -0,0 +1,24 @@
+Origin: https://gitlab.haskell.org/ghc/ghc/-/issues/20287#note_422320
+Description: Fix build on all architectures.
+ exited with an error:
+ ghc: panic! (the 'impossible' happened)
+ (GHC version 9.2.0.20210821:
+ Couldn't find #define HS_CONSTANTS " in
+--- a/compiler/GHC/Unit/State.hs
++++ b/compiler/GHC/Unit/State.hs
+@@ -613,7 +613,13 @@ initUnits logger dflags cached_dbs = do
+       -- really need to use the platform constants but they have not been loaded.
+       case lookupUnitId unit_state rtsUnitId of
+         Nothing   -> return Nothing
+-        Just info -> lookupPlatformConstants (fmap ST.unpack (unitIncludeDirs info))
++        Just info ->
++          let
++            p :: String
++            p = topDir dflags ++ "/include"
++            ps :: [String]
++            ps = fmap ST.unpack (unitIncludeDirs info)
++          in lookupPlatformConstants (p : ps)
+ 
+   return (dbs,unit_state,home_unit,mconstants)
+ 
+


=====================================
p/ghc/debian/patches/series
=====================================
@@ -11,3 +11,4 @@ fix-llvm-armel
 78db231ffdf8385662812781c1d09c630cfad313.patch
 ddd2591c5ca395e39ea36855e5b7e0a3464b7ad8.patch
 separate-docs
+build-fix-hs-constants.patch



View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/commit/8349ec0d5ef6b81c85d1d9e9cd04596fca4e68e5

-- 
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/commit/8349ec0d5ef6b81c85d1d9e9cd04596fca4e68e5
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/20221129/3aea51c9/attachment-0001.htm>