lang/ghc: Update to 9.6.4

freebsd · Mar 2, 2024 · 189c268 · 189c268
1 parent 1b1770f
commit 189c268
Show file tree

Hide file tree

Showing 5 changed files with 499 additions and 41 deletions.
diff --git a/lang/ghc/Makefile b/lang/ghc/Makefile
@@ -71,21 +71,21 @@ GMP_VARS_OFF=		hadrian_gmp_arg=--bignum=native
 PROFILE_VARS=		enable_profile=YES hadrian_setting_profile=True
 PROFILE_VARS_OFF=	enable_profile=NO hadrian_setting_profile=False
 
-GHC_VERSION?=		9.4.8
-LLVM_VERSION?=		13
+GHC_VERSION?=		9.6.4
+LLVM_VERSION?=		15
 BOOT_GHC_VERSION?=	9.2.8
 # LLVM version that bootstrap compiler uses
 BOOT_LLVM_VERSION?=	12
 
-BASE_PACKAGES?=		Cabal-3.8.1.0 array-0.5.4.0 base-4.17.2.1 binary-0.8.9.1 \
-			bytestring-0.11.5.3 containers-0.6.7 deepseq-1.4.8.0 \
-			directory-1.3.7.1 exceptions-0.10.5 filepath-1.4.2.2 \
+BASE_PACKAGES?=		Cabal-3.10.1.0 array-0.5.6.0 base-4.18.2.0 binary-0.8.9.1 \
+			bytestring-0.11.5.3 containers-0.6.7 deepseq-1.4.8.1 \
+			directory-1.3.8.1 exceptions-0.10.7 filepath-1.4.200.1 \
 			ghc-${GHC_VERSION} ghc-bignum-1.3 ghc-compact-0.1.0.0 \
-			ghc-prim-0.9.1 haskeline-0.8.2 hpc-0.6.1.0 \
-			integer-gmp-1.1 mtl-2.2.2 parsec-3.1.16.1 pretty-1.1.3.6 \
-			process-1.6.18.0 stm-2.5.1.0 template-haskell-2.19.0.0 \
-			terminfo-0.4.1.5 text-2.0.2 time-1.12.2 \
-			transformers-0.5.6.2 unix-2.7.3 xhtml-3000.2.2.1
+			ghc-prim-0.10.0 haskeline-0.8.2.1 hpc-0.6.2.0 \
+			integer-gmp-1.1 mtl-2.3.1 parsec-3.1.16.1 pretty-1.1.3.6 \
+			process-1.6.17.0 stm-2.5.1.0 template-haskell-2.20.0.0 \
+			terminfo-0.4.1.6 text-2.0.2 time-1.12.2 \
+			transformers-0.6.1.0 unix-2.8.4.0 xhtml-3000.2.2.1
 
 .for pkg in ${BASE_PACKAGES}
 PLIST_SUB+=	${pkg:C/-([0-9.])+//:tu}_VERSION=${pkg:C/^([^\.]*-)+//}

diff --git a/lang/ghc/distinfo b/lang/ghc/distinfo
@@ -1,10 +1,14 @@
-TIMESTAMP = 1706560545
+TIMESTAMP = 1708789087
+SHA256 (ghc-9.6.4-src.tar.xz) = 10bf25b8b07174fdd9868b5c0c56c17c0ef1edcb6247b4b864be933651bfd4c0
+SIZE (ghc-9.6.4-src.tar.xz) = 29451856
 SHA256 (ghc-9.4.8-src.tar.xz) = 0bf407eb67fe3e3c24b0f4c8dea8cb63e07f63ca0f76cf2058565143507ab85e
 SIZE (ghc-9.4.8-src.tar.xz) = 28655220
 SHA256 (ghc-9.2.8-src.tar.xz) = 5f13d1786bf4fd12f4b45faa37abedb5bb3f36d5e58f7da5307e8bfe88a567a1
 SIZE (ghc-9.2.8-src.tar.xz) = 24661260
 SHA256 (ghc-8.10.7-src.tar.xz) = e3eef6229ce9908dfe1ea41436befb0455fefb1932559e860ad4c606b0d03c9d
 SIZE (ghc-8.10.7-src.tar.xz) = 19932668
+SHA256 (hadrian-9.6.4-boot.tar.gz) = 93152bb56ece601b6ea9924aa2ded2a66768c345607f790f3fe015055c1d6cdf
+SIZE (hadrian-9.6.4-boot.tar.gz) = 1495579
 SHA256 (hadrian-9.4.8-boot.tar.gz) = 5eb060655686921b086645dcbdd6268f09bc66baf8cc76fce74dea9b8b55ab5d
 SIZE (hadrian-9.4.8-boot.tar.gz) = 1495586
 SHA256 (hadrian-9.2.8-boot.tar.gz) = 730412e1c17309670075be8f76dbca9ebadedfa10b758e605f9e67804e9e8ac5

diff --git a/lang/ghc/files/UserSettings.hs b/lang/ghc/files/UserSettings.hs
@@ -14,6 +14,7 @@ module UserSettings (
     verboseCommand, buildProgressColour, successColour, finalStage
     ) where
 
+import qualified Data.Set as Set
 import Flavour.Type
 import Expression
 import {-# SOURCE #-} Settings.Default
@@ -35,12 +36,12 @@ userFlavours = [userFlavour] -- Add more build flavours if need be.
 userFlavour :: Flavour
 userFlavour = defaultFlavour {
     name = "ports"
-  , libraryWays = remove ws defaultLibraryWays
+  , libraryWays = Set.difference <$> defaultLibraryWays <*> pure ws
   , dynamicGhcPrograms = pure %%DYNAMIC%%
 --  , ghcProfiled = %%PROFILE%%
   }
   where
-    ws = concat [
+    ws = Set.fromList $ concat [
         if %%DYNAMIC%% then [] else [dynamic]
       , if %%PROFILE%% then [] else [profiling]]
 

diff --git a/lang/ghc/files/patch-hadrian_src_Hadrian_Haskell_Cabal_Parse.hs b/lang/ghc/files/patch-hadrian_src_Hadrian_Haskell_Cabal_Parse.hs
@@ -0,0 +1,13 @@
+--- hadrian/src/Hadrian/Haskell/Cabal/Parse.hs.orig	2024-01-08 13:24:59 UTC
++++ hadrian/src/Hadrian/Haskell/Cabal/Parse.hs
+@@ -320,8 +320,8 @@ write_inplace_conf pkg_path res_path pd lbi = do
+                   pkg_name = C.display (C.pkgName (CP.sourcePackageId installedPkgInfo))
+                   final_ipi = installedPkgInfo {
+                                  Installed.includeDirs = concatMap fixupIncludeDir (Installed.includeDirs installedPkgInfo),
+-                                 Installed.libraryDirs = [ build_dir ],
+-                                 Installed.libraryDynDirs = [ build_dir ],
++                                 Installed.libraryDirs = [ build_dir ] ++ Installed.libraryDirs installedPkgInfo,
++                                 Installed.libraryDynDirs = [ build_dir ] ++ Installed.libraryDynDirs installedPkgInfo,
+                                  Installed.dataDir = "${pkgroot}/../../../../" ++ pkg_path,
+                                  Installed.haddockHTMLs = [build_dir ++ "/doc/html/" ++ C.display (CP.sourcePackageId installedPkgInfo)],
+                                  Installed.haddockInterfaces = [build_dir ++ "/doc/html/" ++  pkg_name ++ "/" ++ pkg_name ++ ".haddock"],