CVS commit: pkgsrc/lang/ghc94

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

Module Name:    pkgsrc
Committed By:   pho
Date:           Sat Jan 21 16:02:11 UTC 2023

Modified Files:
        pkgsrc/lang/ghc94: distinfo
        pkgsrc/lang/ghc94/patches: patch-rts_linker_MMap.c

Log Message:
Add a merge request URL to a patch


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/lang/ghc94/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/ghc94/patches/patch-rts_linker_MMap.c

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.5 pkgsrc/lang/ghc94/distinfo:1.6
--- pkgsrc/lang/ghc94/distinfo:1.5      Sat Jan 21 13:28:50 2023
+++ pkgsrc/lang/ghc94/distinfo  Sat Jan 21 16:02:11 2023
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2023/01/21 13:28:50 pho Exp $
+$NetBSD: distinfo,v 1.6 2023/01/21 16:02:11 pho Exp $
 
 BLAKE2s (ghc-9.0.1-boot-hadrian.tar.gz) = fff7259676e3d0281c7e15e684b65dc04313c9bcb4d6161962325c3fcee08c7b
 SHA512 (ghc-9.0.1-boot-hadrian.tar.gz) = 02047ca0718a240ce702aeac16c2194b6bf73119dacb59816c1e9a631667e420e44c6ef6d5b83f225af3bd31e3ec3fc8f28e9a3cb22e86f63089110429759878
@@ -59,7 +59,7 @@ SHA1 (patch-libraries_unix_System_Posix_
 SHA1 (patch-libraries_unix_System_Posix_Signals.hsc) = 49215dce493a6bbc440f91a3959e592f86fc779b
 SHA1 (patch-libraries_unix_include_execvpe.h) = 560c6e9b644687fad62e380f73f08359c48639a2
 SHA1 (patch-m4_fptools__set__haskell__platform__vars.m4) = 8c7a7ab965f4df8a68bedb35c32ee32c59ac2c94
-SHA1 (patch-rts_linker_MMap.c) = 8325e7714db4d2eff2cba35cc7dd9650ef75bc6d
+SHA1 (patch-rts_linker_MMap.c) = 9015bd4db6df0fa44e5d74d79d50c608fe306e98
 SHA1 (patch-rts_linker_MMap.h) = 8228fabcdaeb1511191da9fc614ff94d3eee8fbd
 SHA1 (patch-rts_rts.cabal.in) = 605e30da81e444046d00457fc3961025c2073615
 SHA1 (patch-utils_haddock_driver_Main.hs) = 26b015d3aef9fdff66e66c8e3d9a370a2dbd7067

Index: pkgsrc/lang/ghc94/patches/patch-rts_linker_MMap.c
diff -u pkgsrc/lang/ghc94/patches/patch-rts_linker_MMap.c:1.1 pkgsrc/lang/ghc94/patches/patch-rts_linker_MMap.c:1.2
--- pkgsrc/lang/ghc94/patches/patch-rts_linker_MMap.c:1.1       Sat Jan 21 04:49:25 2023
+++ pkgsrc/lang/ghc94/patches/patch-rts_linker_MMap.c   Sat Jan 21 16:02:11 2023
@@ -1,4 +1,4 @@
-$NetBSD: patch-rts_linker_MMap.c,v 1.1 2023/01/21 04:49:25 pho Exp $
+$NetBSD: patch-rts_linker_MMap.c,v 1.2 2023/01/21 16:02:11 pho Exp $
 
 Hunk #0-2, #6:
     NetBSD-specific way of switching pages from rw- to r-x. Even when the
@@ -8,15 +8,17 @@ Hunk #0-2, #6:
     disable PaX MPROTECT entirely then we could omit this change, but of
     course that's not the right thing to do.
 
-    pho@ is reluctant to upstream these hunks because this change alone
-    doesn't make GHCi work on NetBSD. We also need hunk #3-5 but they are
-    rather hackish and don't really seem right.
+    Merge request:
+    https://gitlab.haskell.org/ghc/ghc/-/merge_requests/9769
 
 Hunk #3-5:
     NetBSD mmap(2) doesn't work the same way as that of Linux. We
     essentially can't use the hint address to map a new page based on the
     address of the previously mapped one.
 
+    Merge request:
+    https://gitlab.haskell.org/ghc/ghc/-/merge_requests/9769
+
     Minimal test case:
     https://gist.github.com/depressed-pho/a629247b48b3e6178e35a14c62e9d44f