CVS commit: pkgsrc/lang/ghc910

["Masatake Daimon" <pho%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   pho
Date:           Sun Feb  2 16:21:31 UTC 2025

Modified Files:
        pkgsrc/lang/ghc910: distinfo
Added Files:
        pkgsrc/lang/ghc910/patches:
            patch-hadrian_src_Hadrian_Haskell_Cabal_Parse.hs

Log Message:
lang/ghc910: Work around an issue wrt. parallel build


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/lang/ghc910/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/lang/ghc910/patches/patch-hadrian_src_Hadrian_Haskell_Cabal_Parse.hs

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/ghc910/distinfo
diff -u pkgsrc/lang/ghc910/distinfo:1.3 pkgsrc/lang/ghc910/distinfo:1.4
--- pkgsrc/lang/ghc910/distinfo:1.3     Sun Feb  2 09:40:50 2025
+++ pkgsrc/lang/ghc910/distinfo Sun Feb  2 16:21:31 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2025/02/02 09:40:50 pho Exp $
+$NetBSD: distinfo,v 1.4 2025/02/02 16:21:31 pho Exp $
 
 BLAKE2s (ghc-9.10.1-src.tar.xz) = 7e4433ead6349bd073d31803b63e6c39fb3833ad691e985e25bc5b027da7fb85
 SHA512 (ghc-9.10.1-src.tar.xz) = 46d47e7811a19dcce501002ab674d84ab2fcb842309b5094af52dc5ad26bf5b309b160c1b689f3342666013bf4b0587425c60fbd6c637e739839d41a6a96d990
@@ -34,6 +34,7 @@ SHA1 (patch-hadrian_bindist_Makefile) = 
 SHA1 (patch-hadrian_bootstrap_bootstrap.py) = bf96af392612aad143373f628dcbd3345b83eee7
 SHA1 (patch-hadrian_bootstrap_src_Main.hs) = 2e0a7ae2ef195013ca07313c150a7e48b6985e32
 SHA1 (patch-hadrian_src_Builder.hs) = 848aae01ed5e7095ea9e5864d6b6afe23f653b90
+SHA1 (patch-hadrian_src_Hadrian_Haskell_Cabal_Parse.hs) = 6b2d7a4c7b2d63a8a8bf6b089bbb275201d27081
 SHA1 (patch-hadrian_src_Rules_BinaryDist.hs) = 8ea388ce1f380c854be871ee8361d5aace67e9a6
 SHA1 (patch-hadrian_src_Rules_Documentation.hs) = 29cef344130c616d9eb0cc9723d06414186d30dd
 SHA1 (patch-hadrian_src_Settings_Builders_Cabal.hs) = 16f2b1fa9d5259ec86773449b9e936b95a2f3219

Added files:

Index: pkgsrc/lang/ghc910/patches/patch-hadrian_src_Hadrian_Haskell_Cabal_Parse.hs
diff -u /dev/null pkgsrc/lang/ghc910/patches/patch-hadrian_src_Hadrian_Haskell_Cabal_Parse.hs:1.1
--- /dev/null   Sun Feb  2 16:21:32 2025
+++ pkgsrc/lang/ghc910/patches/patch-hadrian_src_Hadrian_Haskell_Cabal_Parse.hs Sun Feb  2 16:21:31 2025
@@ -0,0 +1,29 @@
+$NetBSD: patch-hadrian_src_Hadrian_Haskell_Cabal_Parse.hs,v 1.1 2025/02/02 16:21:31 pho Exp $
+
+Paper over an upstream bug with respect to parallel build:
+https://gitlab.haskell.org/ghc/ghc/-/issues/24436
+
+--- hadrian/src/Hadrian/Haskell/Cabal/Parse.hs.orig    2025-02-02 16:01:35.734838907 +0000
++++ hadrian/src/Hadrian/Haskell/Cabal/Parse.hs
+@@ -71,6 +71,7 @@ import System.Directory (getCurrentDirec
+ import qualified Distribution.InstalledPackageInfo as CP
+ import Distribution.Simple.Utils (writeUTF8File)
+ import Utilities
++import Packages
+ 
+ 
+ -- | Parse the Cabal file of a given 'Package'. This operation is cached by the
+@@ -150,8 +151,12 @@ configurePackage context@Context {..} = 
+ 
+     -- Stage packages are those we have in this stage.
+     stagePkgs <- stagePackages stage
++    let maybeLinearise dep
++          | dep == ghcInternal && package == base        = Final
++          | dep == ghcPrim     && package == ghcInternal = Final
++          | otherwise                                    = iplace
+     -- We'll need those packages in our package database.
+-    deps <- sequence [ pkgConfFile (context { package = pkg })
++    deps <- sequence [ pkgConfFile (context { package = pkg, iplace = maybeLinearise pkg })
+                      | pkg <- depPkgs, pkg `elem` stagePkgs ]
+     need $ extraPreConfigureDeps ++ deps
+