CVS commit: pkgsrc/lang/ghc98

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

Module Name:    pkgsrc
Committed By:   pho
Date:           Sun May 12 02:52:35 UTC 2024

Modified Files:
        pkgsrc/lang/ghc98: distinfo
        pkgsrc/lang/ghc98/patches: patch-hadrian_src_Settings_Packages.hs
            patch-m4_fp__find__cxx__std__lib.m4

Log Message:
lang/ghc98: Add an upstream URL to a patch


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/lang/ghc98/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/lang/ghc98/patches/patch-hadrian_src_Settings_Packages.hs \
    pkgsrc/lang/ghc98/patches/patch-m4_fp__find__cxx__std__lib.m4

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

Modified files:

Index: pkgsrc/lang/ghc98/distinfo
diff -u pkgsrc/lang/ghc98/distinfo:1.7 pkgsrc/lang/ghc98/distinfo:1.8
--- pkgsrc/lang/ghc98/distinfo:1.7      Sat May 11 18:37:40 2024
+++ pkgsrc/lang/ghc98/distinfo  Sun May 12 02:52:34 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2024/05/11 18:37:40 pho Exp $
+$NetBSD: distinfo,v 1.8 2024/05/12 02:52:34 pho Exp $
 
 BLAKE2s (ghc-9.4.7-boot-aarch64-apple-darwin.tar.xz) = c771cfa45f5635bdf8175775cf7a67c9541bd5b4d4927ed9b5189e3dcefcd2ba
 SHA512 (ghc-9.4.7-boot-aarch64-apple-darwin.tar.xz) = 3d50e4c6605ebfa7eef018d3e9e11e8115cf2f97e24a5adfc05fd1bab152c726e240f9a213d73e220dc7fc5b9358df74eee0d4cb1b77bd5491f28899c831b1a4
@@ -36,7 +36,7 @@ SHA1 (patch-hadrian_bootstrap_src_Main.h
 SHA1 (patch-hadrian_src_Builder.hs) = bbfb1ddc30af900c89ca3cf649a32da2a1c83174
 SHA1 (patch-hadrian_src_Rules_BinaryDist.hs) = fb908f74b8b619bccd673fbdb40b1c53ab7a51d8
 SHA1 (patch-hadrian_src_Settings_Builders_Ghc.hs) = e2913e9f83bb36bb0b432a24518c9b6ca2990c6a
-SHA1 (patch-hadrian_src_Settings_Packages.hs) = d7dce5ff44a3dc05efc6c31aed7234c235594231
+SHA1 (patch-hadrian_src_Settings_Packages.hs) = f21f801727cf5889c3b41e88beb33290a4cc1574
 SHA1 (patch-libraries_Cabal_Cabal_src_Distribution_Simple_GHC.hs) = 9e6028dd6ffc2d3c71493fbb7336adcec9f08f78
 SHA1 (patch-libraries_Cabal_Cabal_src_Distribution_Simple_Register.hs) = 2bfadb25ae6fdc701c3de988d8886eab48999de6
 SHA1 (patch-libraries_base_GHC_Event_KQueue.hsc) = 8ee5da667a241a05fde3c580d3dc9bdc05aa5f00
@@ -52,7 +52,7 @@ SHA1 (patch-libraries_unix_System_Posix_
 SHA1 (patch-libraries_unix_System_Posix_Signals.hsc) = ee59a04571881382bcfd9fc82bf196ff86a40ed5
 SHA1 (patch-libraries_unix_System_Posix_User.hsc) = b583f591838fe2d7f42241787e02c5385d336939
 SHA1 (patch-libraries_unix_System_Posix_User_ByteString.hsc) = 2a331de2292835ae6904980facd8201705fa63e8
-SHA1 (patch-m4_fp__find__cxx__std__lib.m4) = 35196c70e462df054f6b06c299474937a1b71b58
+SHA1 (patch-m4_fp__find__cxx__std__lib.m4) = 67a86c6eaf4ce1cabb87080651ec4b42f3b7a914
 SHA1 (patch-m4_fptools__set__haskell__platform__vars.m4) = 8c7a7ab965f4df8a68bedb35c32ee32c59ac2c94
 SHA1 (patch-rts_rts.cabal.in) = f913753935b64a26f57d9b7304180d944dcb78f6
 SHA1 (patch-utils_haddock_driver_Main.hs) = 26b015d3aef9fdff66e66c8e3d9a370a2dbd7067

Index: pkgsrc/lang/ghc98/patches/patch-hadrian_src_Settings_Packages.hs
diff -u pkgsrc/lang/ghc98/patches/patch-hadrian_src_Settings_Packages.hs:1.1 pkgsrc/lang/ghc98/patches/patch-hadrian_src_Settings_Packages.hs:1.2
--- pkgsrc/lang/ghc98/patches/patch-hadrian_src_Settings_Packages.hs:1.1        Sun Apr 28 05:58:58 2024
+++ pkgsrc/lang/ghc98/patches/patch-hadrian_src_Settings_Packages.hs    Sun May 12 02:52:35 2024
@@ -1,8 +1,9 @@
-$NetBSD: patch-hadrian_src_Settings_Packages.hs,v 1.1 2024/04/28 05:58:58 pho Exp $
+$NetBSD: patch-hadrian_src_Settings_Packages.hs,v 1.2 2024/05/12 02:52:35 pho Exp $
 
 Hunk #0, #1:
-  Don't assume we always build the threaded RTS.
-  TODO: Upstream this.
+  Don't assume we always build the threaded RTS. We can't upstream this
+  until they adopt this change to Haddock:
+  https://github.com/haskell/haddock/commit/75a94e010fb5b0236c670d22b04f5472397dc15d
 
 Hunk #2:
   Hadrian does something unholy on i386 to gain speed but it seems to be
Index: pkgsrc/lang/ghc98/patches/patch-m4_fp__find__cxx__std__lib.m4
diff -u pkgsrc/lang/ghc98/patches/patch-m4_fp__find__cxx__std__lib.m4:1.1 pkgsrc/lang/ghc98/patches/patch-m4_fp__find__cxx__std__lib.m4:1.2
--- pkgsrc/lang/ghc98/patches/patch-m4_fp__find__cxx__std__lib.m4:1.1   Mon May  6 02:26:40 2024
+++ pkgsrc/lang/ghc98/patches/patch-m4_fp__find__cxx__std__lib.m4       Sun May 12 02:52:35 2024
@@ -1,10 +1,10 @@
-$NetBSD: patch-m4_fp__find__cxx__std__lib.m4,v 1.1 2024/05/06 02:26:40 pho Exp $
+$NetBSD: patch-m4_fp__find__cxx__std__lib.m4,v 1.2 2024/05/12 02:52:35 pho Exp $
 
 $CXX must not be quoted because it may contain flags. The same goes for
 $CC. This causes a configuration failure on MacOS X 14 where AC_PROG_CXX
 sets $CXX to "clang++ -std=gnu++11".
 
-TODO: Upstream this.
+https://gitlab.haskell.org/ghc/ghc/-/merge_requests/12612
 
 --- m4/fp_find_cxx_std_lib.m4.orig     2024-05-05 18:35:55.965776858 +0000
 +++ m4/fp_find_cxx_std_lib.m4