Sun May 12 02:52:35 2024 UTC (11d)
lang/ghc98: Add an upstream URL to a patch


(pho)
diff -r1.7 -r1.8 pkgsrc/lang/ghc98/distinfo
diff -r1.1 -r1.2 pkgsrc/lang/ghc98/patches/patch-hadrian_src_Settings_Packages.hs
diff -r1.1 -r1.2 pkgsrc/lang/ghc98/patches/patch-m4_fp__find__cxx__std__lib.m4
cvs diff -r1.7 -r1.8 pkgsrc/lang/ghc98/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/ghc98/distinfo 2024/05/11 18:37:40 1.7
+++ pkgsrc/lang/ghc98/distinfo 2024/05/12 02:52:34 1.8
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.7 2024/05/11 18:37:40 pho Exp $ 1$NetBSD: distinfo,v 1.8 2024/05/12 02:52:34 pho Exp $
2 2
3BLAKE2s (ghc-9.4.7-boot-aarch64-apple-darwin.tar.xz) = c771cfa45f5635bdf8175775cf7a67c9541bd5b4d4927ed9b5189e3dcefcd2ba 3BLAKE2s (ghc-9.4.7-boot-aarch64-apple-darwin.tar.xz) = c771cfa45f5635bdf8175775cf7a67c9541bd5b4d4927ed9b5189e3dcefcd2ba
4SHA512 (ghc-9.4.7-boot-aarch64-apple-darwin.tar.xz) = 3d50e4c6605ebfa7eef018d3e9e11e8115cf2f97e24a5adfc05fd1bab152c726e240f9a213d73e220dc7fc5b9358df74eee0d4cb1b77bd5491f28899c831b1a4 4SHA512 (ghc-9.4.7-boot-aarch64-apple-darwin.tar.xz) = 3d50e4c6605ebfa7eef018d3e9e11e8115cf2f97e24a5adfc05fd1bab152c726e240f9a213d73e220dc7fc5b9358df74eee0d4cb1b77bd5491f28899c831b1a4
5Size (ghc-9.4.7-boot-aarch64-apple-darwin.tar.xz) = 109805384 bytes 5Size (ghc-9.4.7-boot-aarch64-apple-darwin.tar.xz) = 109805384 bytes
6BLAKE2s (ghc-9.4.7-boot-aarch64-unknown-netbsd.tar.xz) = a691117b405b9f7954b954acc382b3357a9ff8c98151514c82d18d83da397940 6BLAKE2s (ghc-9.4.7-boot-aarch64-unknown-netbsd.tar.xz) = a691117b405b9f7954b954acc382b3357a9ff8c98151514c82d18d83da397940
7SHA512 (ghc-9.4.7-boot-aarch64-unknown-netbsd.tar.xz) = 1c917a52a020be3a1878f9d7e8e4c47d31180e54248c127a60706c1053a95b2d8a487f79e7fb5daa725178f271a7cc17e4e7b47ce2119f8546e259c63b9864d8 7SHA512 (ghc-9.4.7-boot-aarch64-unknown-netbsd.tar.xz) = 1c917a52a020be3a1878f9d7e8e4c47d31180e54248c127a60706c1053a95b2d8a487f79e7fb5daa725178f271a7cc17e4e7b47ce2119f8546e259c63b9864d8
8Size (ghc-9.4.7-boot-aarch64-unknown-netbsd.tar.xz) = 90305900 bytes 8Size (ghc-9.4.7-boot-aarch64-unknown-netbsd.tar.xz) = 90305900 bytes
9BLAKE2s (ghc-9.4.7-boot-hadrian-ghc9.8.tar.gz) = ac74fdc6f8a5d4a75bda0c6501902c2c160d3780b41b739129b5a36773c295cd 9BLAKE2s (ghc-9.4.7-boot-hadrian-ghc9.8.tar.gz) = ac74fdc6f8a5d4a75bda0c6501902c2c160d3780b41b739129b5a36773c295cd
10SHA512 (ghc-9.4.7-boot-hadrian-ghc9.8.tar.gz) = e086a40eb6b655fcb22744a32247ab596adf649179681d6203514d66cbc0989e6b59430de5f02e18419b27584e2dbac5a418fb40f66bcdc76e8776d1e315a332 10SHA512 (ghc-9.4.7-boot-hadrian-ghc9.8.tar.gz) = e086a40eb6b655fcb22744a32247ab596adf649179681d6203514d66cbc0989e6b59430de5f02e18419b27584e2dbac5a418fb40f66bcdc76e8776d1e315a332
11Size (ghc-9.4.7-boot-hadrian-ghc9.8.tar.gz) = 1527081 bytes 11Size (ghc-9.4.7-boot-hadrian-ghc9.8.tar.gz) = 1527081 bytes
12BLAKE2s (ghc-9.4.7-boot-i386-unknown-freebsd.tar.xz) = f81c97f117156e8d4f1e7cec33a0e969a78ff1be7c9a5ebf212b9e521c1c23f4 12BLAKE2s (ghc-9.4.7-boot-i386-unknown-freebsd.tar.xz) = f81c97f117156e8d4f1e7cec33a0e969a78ff1be7c9a5ebf212b9e521c1c23f4
13SHA512 (ghc-9.4.7-boot-i386-unknown-freebsd.tar.xz) = b32a9d4c6423cd858dcbd4f07e68d3ef49b879323b9eee36c6495574e15881ea70ff2aa3c02897165d6d9872693f4ee11c4fe86b613b49a7864ca4730ebbc865 13SHA512 (ghc-9.4.7-boot-i386-unknown-freebsd.tar.xz) = b32a9d4c6423cd858dcbd4f07e68d3ef49b879323b9eee36c6495574e15881ea70ff2aa3c02897165d6d9872693f4ee11c4fe86b613b49a7864ca4730ebbc865
14Size (ghc-9.4.7-boot-i386-unknown-freebsd.tar.xz) = 78875476 bytes 14Size (ghc-9.4.7-boot-i386-unknown-freebsd.tar.xz) = 78875476 bytes
@@ -26,34 +26,34 @@ SHA512 (ghc-9.4.7-boot-x86_64-unknown-so @@ -26,34 +26,34 @@ SHA512 (ghc-9.4.7-boot-x86_64-unknown-so
26Size (ghc-9.4.7-boot-x86_64-unknown-solaris2.tar.xz) = 128747936 bytes 26Size (ghc-9.4.7-boot-x86_64-unknown-solaris2.tar.xz) = 128747936 bytes
27BLAKE2s (ghc-9.8.2-src.tar.xz) = 4d903dc828e46d12ad4dc8be912e2996666351ecf8b7a5e1c85790f1fb7eaa5a 27BLAKE2s (ghc-9.8.2-src.tar.xz) = 4d903dc828e46d12ad4dc8be912e2996666351ecf8b7a5e1c85790f1fb7eaa5a
28SHA512 (ghc-9.8.2-src.tar.xz) = 9b677d5ead5ebb5df7bc960055a76ef00e68ed8102844997b12154bf71bdbfafdfff9ca31edce86b3df759242a7c98f52a464887973b53985f54ecd9fc4b4627 28SHA512 (ghc-9.8.2-src.tar.xz) = 9b677d5ead5ebb5df7bc960055a76ef00e68ed8102844997b12154bf71bdbfafdfff9ca31edce86b3df759242a7c98f52a464887973b53985f54ecd9fc4b4627
29Size (ghc-9.8.2-src.tar.xz) = 32432564 bytes 29Size (ghc-9.8.2-src.tar.xz) = 32432564 bytes
30SHA1 (patch-compiler_GHC_Driver_Pipeline_Execute.hs) = 8a86aabddfa4cc5dcff3bb9812010696fb6a16df 30SHA1 (patch-compiler_GHC_Driver_Pipeline_Execute.hs) = 8a86aabddfa4cc5dcff3bb9812010696fb6a16df
31SHA1 (patch-compiler_GHC_SysTools_Process.hs) = ceb26657516e207e22d555ec6f87f735344b0d08 31SHA1 (patch-compiler_GHC_SysTools_Process.hs) = ceb26657516e207e22d555ec6f87f735344b0d08
32SHA1 (patch-configure.ac) = 985482ae70830ddbf1334c9c82a2cec78a34bb4c 32SHA1 (patch-configure.ac) = 985482ae70830ddbf1334c9c82a2cec78a34bb4c
33SHA1 (patch-hadrian_bindist_Makefile) = 3a91d56be4f1b59c6534eceb5b1a4f8e86d49c68 33SHA1 (patch-hadrian_bindist_Makefile) = 3a91d56be4f1b59c6534eceb5b1a4f8e86d49c68
34SHA1 (patch-hadrian_bootstrap_bootstrap.py) = bf96af392612aad143373f628dcbd3345b83eee7 34SHA1 (patch-hadrian_bootstrap_bootstrap.py) = bf96af392612aad143373f628dcbd3345b83eee7
35SHA1 (patch-hadrian_bootstrap_src_Main.hs) = 2e0a7ae2ef195013ca07313c150a7e48b6985e32 35SHA1 (patch-hadrian_bootstrap_src_Main.hs) = 2e0a7ae2ef195013ca07313c150a7e48b6985e32
36SHA1 (patch-hadrian_src_Builder.hs) = bbfb1ddc30af900c89ca3cf649a32da2a1c83174 36SHA1 (patch-hadrian_src_Builder.hs) = bbfb1ddc30af900c89ca3cf649a32da2a1c83174
37SHA1 (patch-hadrian_src_Rules_BinaryDist.hs) = fb908f74b8b619bccd673fbdb40b1c53ab7a51d8 37SHA1 (patch-hadrian_src_Rules_BinaryDist.hs) = fb908f74b8b619bccd673fbdb40b1c53ab7a51d8
38SHA1 (patch-hadrian_src_Settings_Builders_Ghc.hs) = e2913e9f83bb36bb0b432a24518c9b6ca2990c6a 38SHA1 (patch-hadrian_src_Settings_Builders_Ghc.hs) = e2913e9f83bb36bb0b432a24518c9b6ca2990c6a
39SHA1 (patch-hadrian_src_Settings_Packages.hs) = d7dce5ff44a3dc05efc6c31aed7234c235594231 39SHA1 (patch-hadrian_src_Settings_Packages.hs) = f21f801727cf5889c3b41e88beb33290a4cc1574
40SHA1 (patch-libraries_Cabal_Cabal_src_Distribution_Simple_GHC.hs) = 9e6028dd6ffc2d3c71493fbb7336adcec9f08f78 40SHA1 (patch-libraries_Cabal_Cabal_src_Distribution_Simple_GHC.hs) = 9e6028dd6ffc2d3c71493fbb7336adcec9f08f78
41SHA1 (patch-libraries_Cabal_Cabal_src_Distribution_Simple_Register.hs) = 2bfadb25ae6fdc701c3de988d8886eab48999de6 41SHA1 (patch-libraries_Cabal_Cabal_src_Distribution_Simple_Register.hs) = 2bfadb25ae6fdc701c3de988d8886eab48999de6
42SHA1 (patch-libraries_base_GHC_Event_KQueue.hsc) = 8ee5da667a241a05fde3c580d3dc9bdc05aa5f00 42SHA1 (patch-libraries_base_GHC_Event_KQueue.hsc) = 8ee5da667a241a05fde3c580d3dc9bdc05aa5f00
43SHA1 (patch-libraries_base_System_CPUTime_Posix_Times.hsc) = 2bfb779d534d12073287274ce5e90b99e457a860 43SHA1 (patch-libraries_base_System_CPUTime_Posix_Times.hsc) = 2bfb779d534d12073287274ce5e90b99e457a860
44SHA1 (patch-libraries_base_System_Environment.hs) = 7d79a91f295915b4408d5f41d5405739d7189215 44SHA1 (patch-libraries_base_System_Environment.hs) = 7d79a91f295915b4408d5f41d5405739d7189215
45SHA1 (patch-libraries_base_configure) = 4e02082cdfde8d927d12f3d2f3d98ace6d4ee116 45SHA1 (patch-libraries_base_configure) = 4e02082cdfde8d927d12f3d2f3d98ace6d4ee116
46SHA1 (patch-libraries_terminfo_configure.ac) = 068c2b89fc997a433709ec171c685654598781d7 46SHA1 (patch-libraries_terminfo_configure.ac) = 068c2b89fc997a433709ec171c685654598781d7
47SHA1 (patch-libraries_time_lib_Data_Time_Clock_Internal_CTimespec.hsc) = 588270767f8a9cbde0648fc99807891fef65d721 47SHA1 (patch-libraries_time_lib_Data_Time_Clock_Internal_CTimespec.hsc) = 588270767f8a9cbde0648fc99807891fef65d721
48SHA1 (patch-libraries_time_lib_Data_Time_Clock_Internal_CTimeval.hs) = 68914d012a98cc4a4a245efeabcb9143dba0246a 48SHA1 (patch-libraries_time_lib_Data_Time_Clock_Internal_CTimeval.hs) = 68914d012a98cc4a4a245efeabcb9143dba0246a
49SHA1 (patch-libraries_unix_System_Posix_Env.hsc) = 414f0310793bf184cdac7546e3f81fee4821a05f 49SHA1 (patch-libraries_unix_System_Posix_Env.hsc) = 414f0310793bf184cdac7546e3f81fee4821a05f
50SHA1 (patch-libraries_unix_System_Posix_Env_ByteString.hsc) = a579c00d7d5d7ffbb73f6499e09588d6417be123 50SHA1 (patch-libraries_unix_System_Posix_Env_ByteString.hsc) = a579c00d7d5d7ffbb73f6499e09588d6417be123
51SHA1 (patch-libraries_unix_System_Posix_Env_PosixString.hsc) = 40d464638eb11cb832f93d9892818655f4d70e00 51SHA1 (patch-libraries_unix_System_Posix_Env_PosixString.hsc) = 40d464638eb11cb832f93d9892818655f4d70e00
52SHA1 (patch-libraries_unix_System_Posix_Signals.hsc) = ee59a04571881382bcfd9fc82bf196ff86a40ed5 52SHA1 (patch-libraries_unix_System_Posix_Signals.hsc) = ee59a04571881382bcfd9fc82bf196ff86a40ed5
53SHA1 (patch-libraries_unix_System_Posix_User.hsc) = b583f591838fe2d7f42241787e02c5385d336939 53SHA1 (patch-libraries_unix_System_Posix_User.hsc) = b583f591838fe2d7f42241787e02c5385d336939
54SHA1 (patch-libraries_unix_System_Posix_User_ByteString.hsc) = 2a331de2292835ae6904980facd8201705fa63e8 54SHA1 (patch-libraries_unix_System_Posix_User_ByteString.hsc) = 2a331de2292835ae6904980facd8201705fa63e8
55SHA1 (patch-m4_fp__find__cxx__std__lib.m4) = 35196c70e462df054f6b06c299474937a1b71b58 55SHA1 (patch-m4_fp__find__cxx__std__lib.m4) = 67a86c6eaf4ce1cabb87080651ec4b42f3b7a914
56SHA1 (patch-m4_fptools__set__haskell__platform__vars.m4) = 8c7a7ab965f4df8a68bedb35c32ee32c59ac2c94 56SHA1 (patch-m4_fptools__set__haskell__platform__vars.m4) = 8c7a7ab965f4df8a68bedb35c32ee32c59ac2c94
57SHA1 (patch-rts_rts.cabal.in) = f913753935b64a26f57d9b7304180d944dcb78f6 57SHA1 (patch-rts_rts.cabal.in) = f913753935b64a26f57d9b7304180d944dcb78f6
58SHA1 (patch-utils_haddock_driver_Main.hs) = 26b015d3aef9fdff66e66c8e3d9a370a2dbd7067 58SHA1 (patch-utils_haddock_driver_Main.hs) = 26b015d3aef9fdff66e66c8e3d9a370a2dbd7067
59SHA1 (patch-utils_haddock_haddock.cabal) = c8a244f2f341b736b65b218590d1a3a8309f55ba 59SHA1 (patch-utils_haddock_haddock.cabal) = c8a244f2f341b736b65b218590d1a3a8309f55ba
cvs diff -r1.1 -r1.2 pkgsrc/lang/ghc98/patches/patch-hadrian_src_Settings_Packages.hs (expand / switch to unified diff)

--- pkgsrc/lang/ghc98/patches/patch-hadrian_src_Settings_Packages.hs 2024/04/28 05:58:58 1.1
+++ pkgsrc/lang/ghc98/patches/patch-hadrian_src_Settings_Packages.hs 2024/05/12 02:52:35 1.2
@@ -1,18 +1,19 @@ @@ -1,18 +1,19 @@
1$NetBSD: patch-hadrian_src_Settings_Packages.hs,v 1.1 2024/04/28 05:58:58 pho Exp $ 1$NetBSD: patch-hadrian_src_Settings_Packages.hs,v 1.2 2024/05/12 02:52:35 pho Exp $
2 2
3Hunk #0, #1: 3Hunk #0, #1:
4 Don't assume we always build the threaded RTS. 4 Don't assume we always build the threaded RTS. We can't upstream this
5 TODO: Upstream this. 5 until they adopt this change to Haddock:
 6 https://github.com/haskell/haddock/commit/75a94e010fb5b0236c670d22b04f5472397dc15d
6 7
7Hunk #2: 8Hunk #2:
8 Hadrian does something unholy on i386 to gain speed but it seems to be 9 Hadrian does something unholy on i386 to gain speed but it seems to be
9 incompatible with LLD. Disable the speed hack to work around a linkage 10 incompatible with LLD. Disable the speed hack to work around a linkage
10 failure. Ideally we should do this by detecting the type of linker but 11 failure. Ideally we should do this by detecting the type of linker but
11 not the OS. (Don't upstream this as-is. Do detect the linker type.) 12 not the OS. (Don't upstream this as-is. Do detect the linker type.)
12 13
13--- hadrian/src/Settings/Packages.hs.orig 2024-02-22 20:59:45.000000000 +0000 14--- hadrian/src/Settings/Packages.hs.orig 2024-02-22 20:59:45.000000000 +0000
14+++ hadrian/src/Settings/Packages.hs 15+++ hadrian/src/Settings/Packages.hs
15@@ -29,6 +29,7 @@ packageArgs = do 16@@ -29,6 +29,7 @@ packageArgs = do
16 cursesLibraryDir <- getSetting CursesLibDir 17 cursesLibraryDir <- getSetting CursesLibDir
17 ffiIncludeDir <- getSetting FfiIncludeDir 18 ffiIncludeDir <- getSetting FfiIncludeDir
18 ffiLibraryDir <- getSetting FfiLibDir 19 ffiLibraryDir <- getSetting FfiLibDir
cvs diff -r1.1 -r1.2 pkgsrc/lang/ghc98/patches/patch-m4_fp__find__cxx__std__lib.m4 (expand / switch to unified diff)

--- pkgsrc/lang/ghc98/patches/patch-m4_fp__find__cxx__std__lib.m4 2024/05/06 02:26:40 1.1
+++ pkgsrc/lang/ghc98/patches/patch-m4_fp__find__cxx__std__lib.m4 2024/05/12 02:52:35 1.2
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1$NetBSD: patch-m4_fp__find__cxx__std__lib.m4,v 1.1 2024/05/06 02:26:40 pho Exp $ 1$NetBSD: patch-m4_fp__find__cxx__std__lib.m4,v 1.2 2024/05/12 02:52:35 pho Exp $
2 2
3$CXX must not be quoted because it may contain flags. The same goes for 3$CXX must not be quoted because it may contain flags. The same goes for
4$CC. This causes a configuration failure on MacOS X 14 where AC_PROG_CXX 4$CC. This causes a configuration failure on MacOS X 14 where AC_PROG_CXX
5sets $CXX to "clang++ -std=gnu++11". 5sets $CXX to "clang++ -std=gnu++11".
6 6
7TODO: Upstream this. 7https://gitlab.haskell.org/ghc/ghc/-/merge_requests/12612
8 8
9--- m4/fp_find_cxx_std_lib.m4.orig 2024-05-05 18:35:55.965776858 +0000 9--- m4/fp_find_cxx_std_lib.m4.orig 2024-05-05 18:35:55.965776858 +0000
10+++ m4/fp_find_cxx_std_lib.m4 10+++ m4/fp_find_cxx_std_lib.m4
11@@ -26,7 +26,7 @@ unknown 11@@ -26,7 +26,7 @@ unknown
12 #endif 12 #endif
13 EOF 13 EOF
14 AC_MSG_CHECKING([C++ standard library flavour]) 14 AC_MSG_CHECKING([C++ standard library flavour])
15- if ! "$CXX" -E actest.cpp -o actest.out; then 15- if ! "$CXX" -E actest.cpp -o actest.out; then
16+ if ! $CXX -E actest.cpp -o actest.out; then 16+ if ! $CXX -E actest.cpp -o actest.out; then
17 rm -f actest.cpp actest.out 17 rm -f actest.cpp actest.out
18 AC_MSG_ERROR([Failed to compile test program]) 18 AC_MSG_ERROR([Failed to compile test program])
19 fi 19 fi
20@@ -54,16 +54,16 @@ int main(int argc, char** argv) { 20@@ -54,16 +54,16 @@ int main(int argc, char** argv) {