CVS commit: pkgsrc/lang/ghc94

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

Module Name:    pkgsrc
Committed By:   pho
Date:           Tue Jan 24 11:13:18 UTC 2023

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

Log Message:
Fix build on FreeBSD/i386


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 pkgsrc/lang/ghc94/distinfo
cvs rdiff -u -r1.2 -r1.3 \
    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.10 pkgsrc/lang/ghc94/distinfo:1.11
--- pkgsrc/lang/ghc94/distinfo:1.10     Tue Jan 24 02:49:26 2023
+++ pkgsrc/lang/ghc94/distinfo  Tue Jan 24 11:13:18 2023
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2023/01/24 02:49:26 pho Exp $
+$NetBSD: distinfo,v 1.11 2023/01/24 11:13:18 pho Exp $
 
 BLAKE2s (ghc-9.0.1-boot-hadrian.tar.gz) = fff7259676e3d0281c7e15e684b65dc04313c9bcb4d6161962325c3fcee08c7b
 SHA512 (ghc-9.0.1-boot-hadrian.tar.gz) = 02047ca0718a240ce702aeac16c2194b6bf73119dacb59816c1e9a631667e420e44c6ef6d5b83f225af3bd31e3ec3fc8f28e9a3cb22e86f63089110429759878
@@ -40,7 +40,7 @@ SHA1 (patch-hadrian_src_Oracles_Setting.
 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) = 99cfa7ec7eaf73fee61303f2367d37e05f55b631
+SHA1 (patch-hadrian_src_Settings_Packages.hs) = 3112830dc86422ab717e12de4c6a76eda80fa909
 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_src_Settings_Packages.hs
diff -u pkgsrc/lang/ghc94/patches/patch-hadrian_src_Settings_Packages.hs:1.2 pkgsrc/lang/ghc94/patches/patch-hadrian_src_Settings_Packages.hs:1.3
--- pkgsrc/lang/ghc94/patches/patch-hadrian_src_Settings_Packages.hs:1.2        Sat Jan 21 18:24:42 2023
+++ pkgsrc/lang/ghc94/patches/patch-hadrian_src_Settings_Packages.hs    Tue Jan 24 11:13:18 2023
@@ -1,9 +1,16 @@
-$NetBSD: patch-hadrian_src_Settings_Packages.hs,v 1.2 2023/01/21 18:24:42 pho Exp $
+$NetBSD: patch-hadrian_src_Settings_Packages.hs,v 1.3 2023/01/24 11:13:18 pho Exp $
 
-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.
+Hunk #0-#2:
+  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.
 
-[1]: https://github.com/haskell/haddock/pull/1575
+  [1]: https://github.com/haskell/haddock/pull/1575
+
+Hunk #3:
+  Hadrian does something unholy on i386 to gain speed but it seems to be
+  incompatible with LLD. Disable the speed hack to work around a linkage
+  failure. Ideally we should do this by detecting the type of linker but
+  not the OS.
 
 --- hadrian/src/Settings/Packages.hs.orig      2022-12-23 16:19:02.000000000 +0000
 +++ hadrian/src/Settings/Packages.hs
@@ -15,7 +22,7 @@ be upstreamed only after [1] is merged a
  
      mconcat
          --------------------------------- base ---------------------------------
-@@ -161,7 +162,17 @@ packageArgs = do
+@@ -161,8 +162,18 @@ packageArgs = do
  
          -------------------------------- haddock -------------------------------
          , package haddock ?
@@ -26,14 +33,15 @@ be upstreamed only after [1] is merged a
 +                -- 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
+           -- Disable SIMDUTF by default due to packaging difficulties
 @@ -387,7 +398,8 @@ rtsPackageArgs = package rts ? do
  
      mconcat
@@ -44,3 +52,12 @@ be upstreamed only after [1] is merged a
            , any (wayUnit Debug) rtsWays     `cabalFlag` "debug"
            , any (wayUnit Dynamic) rtsWays   `cabalFlag` "dynamic"
            , useSystemFfi                    `cabalFlag` "use-system-libffi"
+@@ -444,7 +456,7 @@ rtsPackageArgs = package rts ? do
+ speedHack :: Action Bool
+ speedHack = do
+     i386   <- anyTargetArch ["i386"]
+-    goodOS <- not <$> anyTargetOs ["darwin", "solaris2"]
++    goodOS <- not <$> anyTargetOs ["darwin", "solaris2", "freebsd"]
+     return $ i386 && goodOS
+ 
+ -- See @rts/ghc.mk@.