CVS commit: pkgsrc/lang/ghc910

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

Module Name:    pkgsrc
Committed By:   pho
Date:           Sun Dec 28 07:30:17 UTC 2025

Modified Files:
        pkgsrc/lang/ghc910: bootstrap.mk distinfo
        pkgsrc/lang/ghc910/patches: patch-hadrian_src_Rules_BinaryDist.hs

Log Message:
lang/ghc910: Fix a bug in my previous commit

I thought I tested it thoroughly but turned out it wasn't enough.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/lang/ghc910/bootstrap.mk
cvs rdiff -u -r1.12 -r1.13 pkgsrc/lang/ghc910/distinfo
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/lang/ghc910/patches/patch-hadrian_src_Rules_BinaryDist.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/bootstrap.mk
diff -u pkgsrc/lang/ghc910/bootstrap.mk:1.4 pkgsrc/lang/ghc910/bootstrap.mk:1.5
--- pkgsrc/lang/ghc910/bootstrap.mk:1.4 Sun Dec 28 05:16:50 2025
+++ pkgsrc/lang/ghc910/bootstrap.mk     Sun Dec 28 07:30:17 2025
@@ -1,4 +1,4 @@
-# $NetBSD: bootstrap.mk,v 1.4 2025/12/28 05:16:50 pho Exp $
+# $NetBSD: bootstrap.mk,v 1.5 2025/12/28 07:30:17 pho Exp $
 # -----------------------------------------------------------------------------
 # Select a bindist of bootstrapping compiler on a per-platform basis. See
 # ./files/BOOTSTRAP.md for details.
@@ -242,6 +242,7 @@ BOOT_GHC_VERSION!=  (${BOOT_GHC_VERSION_C
 HADRIAN_BOOT_SOURCE:=  ${HADRIAN_BOOT_SOURCE:S/${BOOT_VERSION}/${BOOT_GHC_VERSION}/}
 
 # Needed because of our patch to Rules.BinaryDist
+ALL_ENV+=              BUILDING_BOOTKIT=YES
 ALL_ENV+=              SYSTEM_DEFAULT_RPATH=${SYSTEM_DEFAULT_RPATH:Q}
 
 # On ELF platforms we use readelf and patchelf to embed relative rpaths

Index: pkgsrc/lang/ghc910/distinfo
diff -u pkgsrc/lang/ghc910/distinfo:1.12 pkgsrc/lang/ghc910/distinfo:1.13
--- pkgsrc/lang/ghc910/distinfo:1.12    Sun Dec 28 05:16:50 2025
+++ pkgsrc/lang/ghc910/distinfo Sun Dec 28 07:30:17 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.12 2025/12/28 05:16:50 pho Exp $
+$NetBSD: distinfo,v 1.13 2025/12/28 07:30:17 pho Exp $
 
 BLAKE2s (ghc-9.10.1-src.tar.xz) = 7e4433ead6349bd073d31803b63e6c39fb3833ad691e985e25bc5b027da7fb85
 SHA512 (ghc-9.10.1-src.tar.xz) = 46d47e7811a19dcce501002ab674d84ab2fcb842309b5094af52dc5ad26bf5b309b160c1b689f3342666013bf4b0587425c60fbd6c637e739839d41a6a96d990
@@ -35,7 +35,7 @@ SHA1 (patch-hadrian_bootstrap_bootstrap.
 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) = ad2d30b42a663d80407cc396f43fffb1e68e4322
+SHA1 (patch-hadrian_src_Rules_BinaryDist.hs) = 02c428b28034e50cc4d1ddfe1aa676b672b471ea
 SHA1 (patch-hadrian_src_Rules_Documentation.hs) = 29cef344130c616d9eb0cc9723d06414186d30dd
 SHA1 (patch-hadrian_src_Settings_Builders_Cabal.hs) = 16f2b1fa9d5259ec86773449b9e936b95a2f3219
 SHA1 (patch-hadrian_src_Settings_Builders_Ghc.hs) = e2913e9f83bb36bb0b432a24518c9b6ca2990c6a

Index: pkgsrc/lang/ghc910/patches/patch-hadrian_src_Rules_BinaryDist.hs
diff -u pkgsrc/lang/ghc910/patches/patch-hadrian_src_Rules_BinaryDist.hs:1.2 pkgsrc/lang/ghc910/patches/patch-hadrian_src_Rules_BinaryDist.hs:1.3
--- pkgsrc/lang/ghc910/patches/patch-hadrian_src_Rules_BinaryDist.hs:1.2        Sun Dec 28 05:16:51 2025
+++ pkgsrc/lang/ghc910/patches/patch-hadrian_src_Rules_BinaryDist.hs    Sun Dec 28 07:30:17 2025
@@ -1,4 +1,4 @@
-$NetBSD: patch-hadrian_src_Rules_BinaryDist.hs,v 1.2 2025/12/28 05:16:51 pho Exp $
+$NetBSD: patch-hadrian_src_Rules_BinaryDist.hs,v 1.3 2025/12/28 07:30:17 pho Exp $
 
 Hunk #1, #2, #4:
     Distinguish bootstrapping bindists from regular ones. This is
@@ -56,7 +56,7 @@ Hunk #0, #6:
              rtsIncludeDir    = ghcBuildDir -/- "lib" -/- distDir -/- rtsDir
                                 -/- "include"
  
-@@ -232,16 +237,7 @@ bindistRules = do
+@@ -232,16 +237,9 @@ bindistRules = do
          copyDirectory (rtsIncludeDir)         bindistFilesDir
          when windowsHost $ createGhcii (bindistFilesDir -/- "bin")
  
@@ -70,11 +70,13 @@ Hunk #0, #6:
 -        cmd_ (bindistFilesDir -/- "bin" -/- ghcPkgName) ["recache"]
 -
 -
-+        bundleVendorLibs bindistFilesDir
++        bootkitRequested <- liftIO $ IO.lookupEnv "BUILDING_BOOTKIT"
++        when (isJust bootkitRequested) $
++          bundleVendorLibs bindistFilesDir
  
          -- TODO: we should only embed the docs that have been generated
          -- depending on the current settings (flavours' "ghcDocs" field and
-@@ -319,7 +315,7 @@ bindistRules = do
+@@ -319,7 +317,7 @@ bindistRules = do
              version        <- setting ProjectVersion
              targetPlatform <- setting TargetPlatformFull
  
@@ -83,7 +85,7 @@ Hunk #0, #6:
  
              -- Finally, we create the archive <root>/bindist/ghc-X.Y.Z-platform.tar.xz
              tarPath <- builderPath (Tar Create)
-@@ -388,7 +384,7 @@ generateBuildMk = do
+@@ -388,7 +386,7 @@ generateBuildMk = do
  -- | Flag to pass to tar to use the given 'Compressor'.
  compressorTarFlag :: Compressor -> String
  compressorTarFlag Gzip  = "--gzip"
@@ -92,7 +94,7 @@ Hunk #0, #6:
  compressorTarFlag Bzip2 = "--bzip"
  
  -- | File extension to use for archives compressed with the given 'Compressor'.
-@@ -556,3 +552,248 @@ createGhcii outDir = do
+@@ -556,3 +554,248 @@ createGhcii outDir = do
        , "exec \"$(dirname \"$0\")\"/ghc --interactive \"$@\""
        ]