CVS commit: pkgsrc/lang/ghc90

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/lang/ghc90
From: "Masatake Daimon" <pho%netbsd.org@localhost>
Date: Wed, 5 May 2021 09:18:53 +0000

Module Name:    pkgsrc
Committed By:   pho
Date:           Wed May  5 09:18:52 UTC 2021

Modified Files:
        pkgsrc/lang/ghc90: distinfo
        pkgsrc/lang/ghc90/patches: patch-aclocal.m4 patch-configure.ac
            patch-libraries_Cabal_Cabal_Distribution_Simple_GHC.hs
            patch-libraries_base_configure
            patch-libraries_unix_include_execvpe.h patch-rts_ProfHeap.c
            patch-rts_posix_GetTime.c patch-rts_posix_OSThreads.c

Log Message:
Add upstream URLs to patch comments


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 pkgsrc/lang/ghc90/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/ghc90/patches/patch-aclocal.m4
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/ghc90/patches/patch-configure.ac \
    pkgsrc/lang/ghc90/patches/patch-libraries_Cabal_Cabal_Distribution_Simple_GHC.hs \
    pkgsrc/lang/ghc90/patches/patch-libraries_base_configure \
    pkgsrc/lang/ghc90/patches/patch-libraries_unix_include_execvpe.h \
    pkgsrc/lang/ghc90/patches/patch-rts_posix_GetTime.c \
    pkgsrc/lang/ghc90/patches/patch-rts_posix_OSThreads.c
cvs rdiff -u -r1.3 -r1.4 pkgsrc/lang/ghc90/patches/patch-rts_ProfHeap.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/ghc90/distinfo
diff -u pkgsrc/lang/ghc90/distinfo:1.12 pkgsrc/lang/ghc90/distinfo:1.13
--- pkgsrc/lang/ghc90/distinfo:1.12     Sat May  1 09:04:57 2021
+++ pkgsrc/lang/ghc90/distinfo  Wed May  5 09:18:52 2021
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.12 2021/05/01 09:04:57 pho Exp $
+$NetBSD: distinfo,v 1.13 2021/05/05 09:18:52 pho Exp $
 
 SHA1 (ghc-8.10.4-boot-x86_64-unknown-netbsd.tar.xz) = 3ff01d768393b3866e7a7543f9f55646aaffce7a
 RMD160 (ghc-8.10.4-boot-x86_64-unknown-netbsd.tar.xz) = 39bf10b13054a6316c8477609fb98abe4277fa6c
@@ -28,27 +28,27 @@ SHA1 (netbsd-9.0-amd64-libterminfo.tar.g
 RMD160 (netbsd-9.0-amd64-libterminfo.tar.gz) = 5a246633c90ee85f71efcc02d8280bd0c50ab5a7
 SHA512 (netbsd-9.0-amd64-libterminfo.tar.gz) = 79288d44b84df8848afc2cdfee628cc4fd1ec0334159403ef8ba994d617bc56a7114af3031198afb5f3b8f45c0463a848099431e32bc6725042908576b6f95b8
 Size (netbsd-9.0-amd64-libterminfo.tar.gz) = 27744 bytes
-SHA1 (patch-aclocal.m4) = 66d27cc50de048beeebee31302107501d5802388
+SHA1 (patch-aclocal.m4) = 5de0a62459cddff19973b27e1f2a7dfac7a51dab
 SHA1 (patch-compiler_GHC_Driver_Pipeline.hs) = cc2c53f14420b8b75bd70b73e2c95bb52a10cd0c
 SHA1 (patch-compiler_GHC_SysTools_Process.hs) = 36d7171e571d56c4e6ae1ed99d2851c0b0dac084
-SHA1 (patch-configure.ac) = 0905a0e5358d8c3f3f8366b597a59dd824f294d8
+SHA1 (patch-configure.ac) = a67c57f39c152a9fc8af830045cf001e957590e2
 SHA1 (patch-ghc.mk) = fdcbc5b0c48b616eb96868e49681536d773eaddd
-SHA1 (patch-libraries_Cabal_Cabal_Distribution_Simple_GHC.hs) = a4c82b1282c0580a7945be8c3b9d38bc760db99f
+SHA1 (patch-libraries_Cabal_Cabal_Distribution_Simple_GHC.hs) = 6d2a9f238ce7a7551002f6da253eb536adcc4a43
 SHA1 (patch-libraries_base_GHC_Event_KQueue.hsc) = 8ee5da667a241a05fde3c580d3dc9bdc05aa5f00
 SHA1 (patch-libraries_base_System_CPUTime_Posix_Times.hsc) = 2bfb779d534d12073287274ce5e90b99e457a860
 SHA1 (patch-libraries_base_System_Environment.hs) = 7d79a91f295915b4408d5f41d5405739d7189215
-SHA1 (patch-libraries_base_configure) = f06a961a6507f635aafe50dab3ff4396c012bdec
+SHA1 (patch-libraries_base_configure) = d31034fcc2e2132961c707d8e55bf7a160eebd63
 SHA1 (patch-libraries_time_lib_Data_Time_Clock_Internal_CTimespec.hsc) = 588270767f8a9cbde0648fc99807891fef65d721
 SHA1 (patch-libraries_time_lib_Data_Time_Clock_Internal_CTimeval.hs) = b2811ec4a845e6b2b44414e940b6108178b597c5
 SHA1 (patch-libraries_unix_System_Posix_Env.hsc) = e94936c139ca15d45cac4a7feb74a601567913ab
 SHA1 (patch-libraries_unix_System_Posix_Env_ByteString.hsc) = 3f675fc5d6bf5cc59a2d5ccffeb9ccd51521645a
 SHA1 (patch-libraries_unix_System_Posix_Files_Common.hsc) = 6efef280832d376915a8987e4e8aac283408f607
 SHA1 (patch-libraries_unix_System_Posix_Signals.hsc) = 49215dce493a6bbc440f91a3959e592f86fc779b
-SHA1 (patch-libraries_unix_include_execvpe.h) = 67dd9720a71a6a55bbe2b50e61621ca60187ef00
-SHA1 (patch-rts_ProfHeap.c) = 38b0623effbe46e04b98fb221591b4ec329a1b37
+SHA1 (patch-libraries_unix_include_execvpe.h) = 560c6e9b644687fad62e380f73f08359c48639a2
+SHA1 (patch-rts_ProfHeap.c) = bc1492578eac7b194caaf1221586cd6c13aa9583
 SHA1 (patch-rts_ghc.mk) = 6e3daf71fb7e656131aa2aeeb0346c651520216a
-SHA1 (patch-rts_posix_GetTime.c) = a0e94043a270697f3754c8e97461fbee36ca78ed
-SHA1 (patch-rts_posix_OSThreads.c) = d5873aad8836067b5f29b37250666e37db67a4be
+SHA1 (patch-rts_posix_GetTime.c) = 036e09510c893ab8677a2b4add0193e7f811bb82
+SHA1 (patch-rts_posix_OSThreads.c) = 4fe5fb21021de05d9803ccbf1715de98ebd55206
 SHA1 (patch-rules_build-package-way.mk) = ec73df0bbc85e962f76a9068683879a1a1ba1815
 SHA1 (patch-rules_distdir-way-opts.mk) = a058c6428faf02ef94aab3336d2d2874f2726f4e
 SHA1 (patch-utils_haddock_driver_Main.hs) = 26b015d3aef9fdff66e66c8e3d9a370a2dbd7067

Index: pkgsrc/lang/ghc90/patches/patch-aclocal.m4
diff -u pkgsrc/lang/ghc90/patches/patch-aclocal.m4:1.2 pkgsrc/lang/ghc90/patches/patch-aclocal.m4:1.3
--- pkgsrc/lang/ghc90/patches/patch-aclocal.m4:1.2      Thu Apr 22 18:15:01 2021
+++ pkgsrc/lang/ghc90/patches/patch-aclocal.m4  Wed May  5 09:18:52 2021
@@ -1,8 +1,11 @@
-$NetBSD: patch-aclocal.m4,v 1.2 2021/04/22 18:15:01 pho Exp $
+$NetBSD: patch-aclocal.m4,v 1.3 2021/05/05 09:18:52 pho Exp $
 
 Remove _AC_PROG_CC_C99 macro that is removed in autoconf-2.71 to fix
 build failure.
 
+Already fixed in the upstream:
+https://gitlab.haskell.org/ghc/ghc/-/merge_requests/4987
+
 --- aclocal.m4.orig    2021-01-26 14:49:54.000000000 +0000
 +++ aclocal.m4
 @@ -656,17 +656,6 @@ AC_DEFUN([FP_SET_CFLAGS_C99],

Index: pkgsrc/lang/ghc90/patches/patch-configure.ac
diff -u pkgsrc/lang/ghc90/patches/patch-configure.ac:1.1 pkgsrc/lang/ghc90/patches/patch-configure.ac:1.2
--- pkgsrc/lang/ghc90/patches/patch-configure.ac:1.1    Tue Feb  9 13:18:36 2021
+++ pkgsrc/lang/ghc90/patches/patch-configure.ac        Wed May  5 09:18:52 2021
@@ -1,7 +1,7 @@
-$NetBSD: patch-configure.ac,v 1.1 2021/02/09 13:18:36 ryoon Exp $
+$NetBSD: patch-configure.ac,v 1.2 2021/05/05 09:18:52 pho Exp $
 
-Don't use non-portable operator ==:
-https://gitlab.haskell.org/ghc/ghc/merge_requests/2497
+Disable DTrace support on solaris2.
+XXX: But why?
 
 --- configure.ac.orig  2021-02-02 21:05:56.000000000 +0000
 +++ configure.ac
Index: pkgsrc/lang/ghc90/patches/patch-libraries_Cabal_Cabal_Distribution_Simple_GHC.hs
diff -u pkgsrc/lang/ghc90/patches/patch-libraries_Cabal_Cabal_Distribution_Simple_GHC.hs:1.1 pkgsrc/lang/ghc90/patches/patch-libraries_Cabal_Cabal_Distribution_Simple_GHC.hs:1.2
--- pkgsrc/lang/ghc90/patches/patch-libraries_Cabal_Cabal_Distribution_Simple_GHC.hs:1.1        Tue Feb  9 13:18:36 2021
+++ pkgsrc/lang/ghc90/patches/patch-libraries_Cabal_Cabal_Distribution_Simple_GHC.hs    Wed May  5 09:18:52 2021
@@ -1,9 +1,9 @@
-$NetBSD: patch-libraries_Cabal_Cabal_Distribution_Simple_GHC.hs,v 1.1 2021/02/09 13:18:36 ryoon Exp $
+$NetBSD: patch-libraries_Cabal_Cabal_Distribution_Simple_GHC.hs,v 1.2 2021/05/05 09:18:52 pho Exp $
 
 Enable Cabal's rpath overriding functionality on all the platforms
 known to use ELF.
 
-When a Cabal package which defins both a library and an executable is
+When a Cabal package which defines both a library and an executable
 to be built, GHC by default embeds an rpath to the *build* directory
 into the executable. This may sound like a bug in GHC but is actually
 not, because GHC doesn't know the fact that the said library is going
@@ -12,6 +12,8 @@ functionality to disable the default rpa
 construct the correct set of rpaths... but only on certain platforms
 for some reason.
 
+Pull request: https://github.com/haskell/cabal/pull/7382
+
 --- libraries/Cabal/Cabal/Distribution/Simple/GHC.hs.orig      2020-01-16 22:47:21.132921936 +0000
 +++ libraries/Cabal/Cabal/Distribution/Simple/GHC.hs
 @@ -1725,10 +1725,10 @@ getRPaths lbi clbi | supportRPaths hostO
Index: pkgsrc/lang/ghc90/patches/patch-libraries_base_configure
diff -u pkgsrc/lang/ghc90/patches/patch-libraries_base_configure:1.1 pkgsrc/lang/ghc90/patches/patch-libraries_base_configure:1.2
--- pkgsrc/lang/ghc90/patches/patch-libraries_base_configure:1.1        Tue Feb  9 13:18:36 2021
+++ pkgsrc/lang/ghc90/patches/patch-libraries_base_configure    Wed May  5 09:18:52 2021
@@ -1,7 +1,10 @@
-$NetBSD: patch-libraries_base_configure,v 1.1 2021/02/09 13:18:36 ryoon Exp $
+$NetBSD: patch-libraries_base_configure,v 1.2 2021/05/05 09:18:52 pho Exp $
 
 Ensure libiconv can be found at runtime.
 
+XXX: I don't think this is needed because rpath flags are handled by
+Cabal. LDFLAGS is not used anyway. (pho@)
+
 --- libraries/base/configure.orig      2020-09-15 12:39:44.549328929 +0000
 +++ libraries/base/configure
 @@ -4459,7 +4459,7 @@ fi
Index: pkgsrc/lang/ghc90/patches/patch-libraries_unix_include_execvpe.h
diff -u pkgsrc/lang/ghc90/patches/patch-libraries_unix_include_execvpe.h:1.1 pkgsrc/lang/ghc90/patches/patch-libraries_unix_include_execvpe.h:1.2
--- pkgsrc/lang/ghc90/patches/patch-libraries_unix_include_execvpe.h:1.1        Tue Feb  9 13:18:36 2021
+++ pkgsrc/lang/ghc90/patches/patch-libraries_unix_include_execvpe.h    Wed May  5 09:18:52 2021
@@ -1,7 +1,9 @@
-$NetBSD: patch-libraries_unix_include_execvpe.h,v 1.1 2021/02/09 13:18:36 ryoon Exp $
+$NetBSD: patch-libraries_unix_include_execvpe.h,v 1.2 2021/05/05 09:18:52 pho Exp $
 
 Don't conflict with builtin execvpe(3).
 
+Already fixed in the upstream (unix-2.8.0.0).
+
 --- libraries/unix/include/execvpe.h.orig      2016-02-04 16:16:38.000000000 +0000
 +++ libraries/unix/include/execvpe.h
 @@ -15,8 +15,10 @@ __hsunix_execvpe(const char *name, char 
Index: pkgsrc/lang/ghc90/patches/patch-rts_posix_GetTime.c
diff -u pkgsrc/lang/ghc90/patches/patch-rts_posix_GetTime.c:1.1 pkgsrc/lang/ghc90/patches/patch-rts_posix_GetTime.c:1.2
--- pkgsrc/lang/ghc90/patches/patch-rts_posix_GetTime.c:1.1     Fri Apr 30 03:05:31 2021
+++ pkgsrc/lang/ghc90/patches/patch-rts_posix_GetTime.c Wed May  5 09:18:52 2021
@@ -1,9 +1,12 @@
-$NetBSD: patch-rts_posix_GetTime.c,v 1.1 2021/04/30 03:05:31 pho Exp $
+$NetBSD: patch-rts_posix_GetTime.c,v 1.2 2021/05/05 09:18:52 pho Exp $
 
 OmniOS defines CLOCK_THREAD_CPUTIME_ID but it isn't actually usable:
 clock_gettime(2) always returns EINVAL. Use Solaris-specific
 gethrvtime(3) instead.
 
+Sent to the upstream:
+https://gitlab.haskell.org/ghc/ghc/-/merge_requests/5678
+
 --- rts/posix/GetTime.c.orig   2021-04-29 21:06:04.382045075 +0000
 +++ rts/posix/GetTime.c
 @@ -32,6 +32,10 @@
Index: pkgsrc/lang/ghc90/patches/patch-rts_posix_OSThreads.c
diff -u pkgsrc/lang/ghc90/patches/patch-rts_posix_OSThreads.c:1.1 pkgsrc/lang/ghc90/patches/patch-rts_posix_OSThreads.c:1.2
--- pkgsrc/lang/ghc90/patches/patch-rts_posix_OSThreads.c:1.1   Thu Apr 22 14:20:24 2021
+++ pkgsrc/lang/ghc90/patches/patch-rts_posix_OSThreads.c       Wed May  5 09:18:52 2021
@@ -1,8 +1,9 @@
-$NetBSD: patch-rts_posix_OSThreads.c,v 1.1 2021/04/22 14:20:24 pho Exp $
+$NetBSD: patch-rts_posix_OSThreads.c,v 1.2 2021/05/05 09:18:52 pho Exp $
 
 Implementation of getNumberOfProcessors() for NetBSD
 
-TODO: Send this to the upstream.
+Sent to the upstream:
+https://gitlab.haskell.org/ghc/ghc/-/merge_requests/5679
 
 --- rts/posix/OSThreads.c.orig 2021-04-22 12:36:33.476115260 +0000
 +++ rts/posix/OSThreads.c

Index: pkgsrc/lang/ghc90/patches/patch-rts_ProfHeap.c
diff -u pkgsrc/lang/ghc90/patches/patch-rts_ProfHeap.c:1.3 pkgsrc/lang/ghc90/patches/patch-rts_ProfHeap.c:1.4
--- pkgsrc/lang/ghc90/patches/patch-rts_ProfHeap.c:1.3  Mon Apr 26 07:41:21 2021
+++ pkgsrc/lang/ghc90/patches/patch-rts_ProfHeap.c      Wed May  5 09:18:52 2021
@@ -1,7 +1,10 @@
-$NetBSD: patch-rts_ProfHeap.c,v 1.3 2021/04/26 07:41:21 pho Exp $
+$NetBSD: patch-rts_ProfHeap.c,v 1.4 2021/05/05 09:18:52 pho Exp $
 
 NetBSD does not have uselocale(3).
 
+Sent to the upstream:
+https://gitlab.haskell.org/ghc/ghc/-/merge_requests/5677
+
 --- rts/ProfHeap.c.orig        2021-01-25 16:30:28.000000000 +0000
 +++ rts/ProfHeap.c
 @@ -69,7 +69,7 @@ static locale_t prof_locale = 0, saved_locale = 0;

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/devel
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/devel
Indexes:

Home | Main Index | Thread Index | Old Index