CVS commit: pkgsrc/lang/ghc94

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

Module Name:    pkgsrc
Committed By:   pho
Date:           Sat Jan 21 18:24:42 UTC 2023

Modified Files:
        pkgsrc/lang/ghc94: distinfo
        pkgsrc/lang/ghc94/patches: patch-hadrian_bootstrap_bootstrap.py
            patch-hadrian_src_Settings_Packages.hs

Log Message:
Build haddock with the threaded RTS when possible


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/lang/ghc94/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/lang/ghc94/patches/patch-hadrian_bootstrap_bootstrap.py \
    pkgsrc/lang/ghc94/patches/patch-hadrian_src_Settings_Packages.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/ghc94/distinfo
diff -u pkgsrc/lang/ghc94/distinfo:1.7 pkgsrc/lang/ghc94/distinfo:1.8
--- pkgsrc/lang/ghc94/distinfo:1.7      Sat Jan 21 16:26:23 2023
+++ pkgsrc/lang/ghc94/distinfo  Sat Jan 21 18:24:42 2023
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2023/01/21 16:26:23 pho Exp $
+$NetBSD: distinfo,v 1.8 2023/01/21 18:24:42 pho Exp $
 
 BLAKE2s (ghc-9.0.1-boot-hadrian.tar.gz) = fff7259676e3d0281c7e15e684b65dc04313c9bcb4d6161962325c3fcee08c7b
 SHA512 (ghc-9.0.1-boot-hadrian.tar.gz) = 02047ca0718a240ce702aeac16c2194b6bf73119dacb59816c1e9a631667e420e44c6ef6d5b83f225af3bd31e3ec3fc8f28e9a3cb22e86f63089110429759878
@@ -34,13 +34,13 @@ SHA1 (patch-compiler_GHC_Driver_Pipeline
 SHA1 (patch-compiler_GHC_SysTools_Process.hs) = ceb26657516e207e22d555ec6f87f735344b0d08
 SHA1 (patch-configure.ac) = 985482ae70830ddbf1334c9c82a2cec78a34bb4c
 SHA1 (patch-hadrian_bindist_Makefile) = 9a2a708d200ee03a199e8626210b13174a5b3663
-SHA1 (patch-hadrian_bootstrap_bootstrap.py) = 0a0aec27437d3e8e034f6dcfc797e9f751ce85a6
+SHA1 (patch-hadrian_bootstrap_bootstrap.py) = 7ef1691e3596f796488574dfd3d829a3cc83a1e2
 SHA1 (patch-hadrian_src_Builder.hs) = fc0d05c4a8b052dac87a8d2e7a6166f8779bd92a
 SHA1 (patch-hadrian_src_Oracles_Setting.hs) = 498d1f810fa2f57151909eb672b73f137f1a7b01
 SHA1 (patch-hadrian_src_Rules_BinaryDist.hs) = fb908f74b8b619bccd673fbdb40b1c53ab7a51d8
 SHA1 (patch-hadrian_src_Settings_Builders_Ghc.hs) = e2913e9f83bb36bb0b432a24518c9b6ca2990c6a
 SHA1 (patch-hadrian_src_Settings_Default.hs) = 0e0278308ca4decac3fabd89831195b2a20c6eab
-SHA1 (patch-hadrian_src_Settings_Packages.hs) = ce0032960a7804950fb58feb7ddbc5dc8697f74a
+SHA1 (patch-hadrian_src_Settings_Packages.hs) = 99cfa7ec7eaf73fee61303f2367d37e05f55b631
 SHA1 (patch-libraries_Cabal_Cabal_src_Distribution_Simple_GHC.hs) = a8b2eeec9a469b43e611f79fbf5b080c1e05aa50
 SHA1 (patch-libraries_base_GHC_Event_KQueue.hsc) = 8ee5da667a241a05fde3c580d3dc9bdc05aa5f00
 SHA1 (patch-libraries_base_System_CPUTime_Posix_Times.hsc) = 2bfb779d534d12073287274ce5e90b99e457a860

Index: pkgsrc/lang/ghc94/patches/patch-hadrian_bootstrap_bootstrap.py
diff -u pkgsrc/lang/ghc94/patches/patch-hadrian_bootstrap_bootstrap.py:1.1 pkgsrc/lang/ghc94/patches/patch-hadrian_bootstrap_bootstrap.py:1.2
--- pkgsrc/lang/ghc94/patches/patch-hadrian_bootstrap_bootstrap.py:1.1  Sat Jan 21 04:49:25 2023
+++ pkgsrc/lang/ghc94/patches/patch-hadrian_bootstrap_bootstrap.py      Sat Jan 21 18:24:42 2023
@@ -1,8 +1,13 @@
-$NetBSD: patch-hadrian_bootstrap_bootstrap.py,v 1.1 2023/01/21 04:49:25 pho Exp $
+$NetBSD: patch-hadrian_bootstrap_bootstrap.py,v 1.2 2023/01/21 18:24:42 pho Exp $
 
 bootstrap.py assumes that GHC always has a threaded RTS but our bootkits
 don't. It is debatable at least as to whether this should be upstreamed.
 
+At least the hack to shake.cabal can be removed when [1] gets merged and
+GHC adopts it in hadrian/bootstrap/*.json.
+
+[1]: https://github.com/ndmitchell/shake/pull/836
+
 --- hadrian/bootstrap/bootstrap.py.orig        2022-12-23 16:19:02.000000000 +0000
 +++ hadrian/bootstrap/bootstrap.py
 @@ -180,7 +180,44 @@ def install_dep(dep: BootstrapDep, ghc: 
Index: pkgsrc/lang/ghc94/patches/patch-hadrian_src_Settings_Packages.hs
diff -u pkgsrc/lang/ghc94/patches/patch-hadrian_src_Settings_Packages.hs:1.1 pkgsrc/lang/ghc94/patches/patch-hadrian_src_Settings_Packages.hs:1.2
--- pkgsrc/lang/ghc94/patches/patch-hadrian_src_Settings_Packages.hs:1.1        Sat Jan 21 04:49:25 2023
+++ pkgsrc/lang/ghc94/patches/patch-hadrian_src_Settings_Packages.hs    Sat Jan 21 18:24:42 2023
@@ -1,10 +1,40 @@
-$NetBSD: patch-hadrian_src_Settings_Packages.hs,v 1.1 2023/01/21 04:49:25 pho Exp $
+$NetBSD: patch-hadrian_src_Settings_Packages.hs,v 1.2 2023/01/21 18:24:42 pho Exp $
 
-Don't assume we always build the threaded RTS. Not upstreamed yet.
+Don't assume we always build the threaded RTS. Not upstreamed yet. This can
+be upstreamed only after [1] is merged and GHC pulls it.
 
---- hadrian/src/Settings/Packages.hs.orig      2023-01-11 04:48:46.860292356 +0000
+[1]: https://github.com/haskell/haddock/pull/1575
+
+--- hadrian/src/Settings/Packages.hs.orig      2022-12-23 16:19:02.000000000 +0000
 +++ hadrian/src/Settings/Packages.hs
-@@ -387,7 +387,8 @@ rtsPackageArgs = package rts ? do
+@@ -29,6 +29,7 @@ packageArgs = do
+     ffiIncludeDir  <- getSetting FfiIncludeDir
+     ffiLibraryDir  <- getSetting FfiLibDir
+     debugAssertions  <- ghcDebugAssertions <$> expr flavour
++    rtsWays          <- getRtsWays
+ 
+     mconcat
+         --------------------------------- base ---------------------------------
+@@ -161,7 +162,17 @@ packageArgs = do
+ 
+         -------------------------------- haddock -------------------------------
+         , package haddock ?
+-          builder (Cabal Flags) ? arg "in-ghc-tree"
++          builder (Cabal Flags) ? mconcat
++          [ arg "in-ghc-tree"
++          , ifM stage0
++                -- We build a threaded haddock on stage 1 if the
++                -- bootstrapping compiler supports it.
++                (threadedBootstrapper `cabalFlag` "threaded")
++
++                -- We build a threaded haddock on stage N, N>1 if the
++                -- configuration calls for it.
++                (any (wayUnit Threaded) rtsWays `cabalFlag` "threaded")
++          ]
+ 
+         ---------------------------------- text --------------------------------
+         , package text ? mconcat
+@@ -387,7 +398,8 @@ rtsPackageArgs = package rts ? do
  
      mconcat
          [ builder (Cabal Flags) ? mconcat