CVS commit: pkgsrc/lang/ghc910

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

Module Name:    pkgsrc
Committed By:   pho
Date:           Wed Mar  5 03:33:59 UTC 2025

Modified Files:
        pkgsrc/lang/ghc910: Makefile buildlink3.mk distinfo
Added Files:
        pkgsrc/lang/ghc910/patches: patch-libraries_base_src_System_CPUTime.hsc
            patch-libraries_ghc-internal_configure.ac

Log Message:
lang/ghc910: Work around PR kern/59127

This causes a behaviour change in the library "base". A recursive revbump
will be needed.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/lang/ghc910/Makefile \
    pkgsrc/lang/ghc910/buildlink3.mk
cvs rdiff -u -r1.7 -r1.8 pkgsrc/lang/ghc910/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/lang/ghc910/patches/patch-libraries_base_src_System_CPUTime.hsc
cvs rdiff -u -r0 -r1.3 \
    pkgsrc/lang/ghc910/patches/patch-libraries_ghc-internal_configure.ac

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

Modified files:

Index: pkgsrc/lang/ghc910/Makefile
diff -u pkgsrc/lang/ghc910/Makefile:1.3 pkgsrc/lang/ghc910/Makefile:1.4
--- pkgsrc/lang/ghc910/Makefile:1.3     Mon Feb  3 16:09:09 2025
+++ pkgsrc/lang/ghc910/Makefile Wed Mar  5 03:33:59 2025
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.3 2025/02/03 16:09:09 pho Exp $
+# $NetBSD: Makefile,v 1.4 2025/03/05 03:33:59 pho Exp $
 # -----------------------------------------------------------------------------
 # Package metadata
 #
 DISTNAME=      ghc-9.10.1-src
 PKGNAME=       ${DISTNAME:S/-src$//}
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    lang
 MASTER_SITES=  https://downloads.haskell.org/~ghc/${PKGVERSION_NOREV}/
 EXTRACT_SUFX=  .tar.xz
@@ -173,8 +173,9 @@ NOT_PAX_ASLR_SAFE+= lib/${PKGNAME_NOREV}
 # We patch configure.ac in some directories.
 post-patch:
        @${PHASE_MSG} "Regenerating configuration scripts for ${PKGNAME}"
-       ${RUN}cd ${WRKSRC} && autoconf
-       ${RUN}cd ${WRKSRC}/libraries/terminfo && autoconf
+       ${RUN}cd ${WRKSRC} && autoreconf
+       ${RUN}cd ${WRKSRC}/libraries/ghc-internal && autoreconf
+       ${RUN}cd ${WRKSRC}/libraries/terminfo && autoreconf
 
 # Define the target "pre-configure", "pre-build", and non-standard
 # "bootstrap".
Index: pkgsrc/lang/ghc910/buildlink3.mk
diff -u pkgsrc/lang/ghc910/buildlink3.mk:1.3 pkgsrc/lang/ghc910/buildlink3.mk:1.4
--- pkgsrc/lang/ghc910/buildlink3.mk:1.3        Mon Feb  3 16:09:09 2025
+++ pkgsrc/lang/ghc910/buildlink3.mk    Wed Mar  5 03:33:59 2025
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.3 2025/02/03 16:09:09 pho Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2025/03/05 03:33:59 pho Exp $
 
 BUILDLINK_TREE+=       ghc
 
 .if !defined(GHC_BUILDLINK3_MK)
 GHC_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.ghc+=    ghc>=9.10.1nb2
-BUILDLINK_ABI_DEPENDS.ghc+=    ghc>=9.10.1nb2
+BUILDLINK_API_DEPENDS.ghc+=    ghc>=9.10.1nb3
+BUILDLINK_ABI_DEPENDS.ghc+=    ghc>=9.10.1nb3
 BUILDLINK_PKGSRCDIR.ghc?=      ../../lang/ghc910
 
 .include "../../converters/libiconv/buildlink3.mk"

Index: pkgsrc/lang/ghc910/distinfo
diff -u pkgsrc/lang/ghc910/distinfo:1.7 pkgsrc/lang/ghc910/distinfo:1.8
--- pkgsrc/lang/ghc910/distinfo:1.7     Tue Mar  4 13:57:17 2025
+++ pkgsrc/lang/ghc910/distinfo Wed Mar  5 03:33:59 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2025/03/04 13:57:17 pho Exp $
+$NetBSD: distinfo,v 1.8 2025/03/05 03:33:59 pho Exp $
 
 BLAKE2s (ghc-9.10.1-src.tar.xz) = 7e4433ead6349bd073d31803b63e6c39fb3833ad691e985e25bc5b027da7fb85
 SHA512 (ghc-9.10.1-src.tar.xz) = 46d47e7811a19dcce501002ab674d84ab2fcb842309b5094af52dc5ad26bf5b309b160c1b689f3342666013bf4b0587425c60fbd6c637e739839d41a6a96d990
@@ -44,7 +44,9 @@ SHA1 (patch-libraries_Cabal_Cabal-syntax
 SHA1 (patch-libraries_Cabal_Cabal_src_Distribution_Simple_GHC.hs) = 365abd84b9a2ac9ab3e325ffa769823b28d20696
 SHA1 (patch-libraries_Cabal_Cabal_src_Distribution_Simple_GHC_Build_Link.hs) = 1a25bd801ad3984b0e86dae5dcd30f0b36ab28f7
 SHA1 (patch-libraries_Cabal_Cabal_src_Distribution_Simple_Register.hs) = 7630d0170d7dc9b17f15b5eacc2c783e07adbd7f
+SHA1 (patch-libraries_base_src_System_CPUTime.hsc) = ec358676996072b18125c01f18d8c01a9934f726
 SHA1 (patch-libraries_base_src_System_CPUTime_Posix_Times.hsc) = 4c43abbdcfc35e35257acede8bbe47324f23ebcb
+SHA1 (patch-libraries_ghc-internal_configure.ac) = 8c102f54a79fd802759c09ccf86285955c344c8e
 SHA1 (patch-libraries_ghc-internal_src_GHC_Internal_Event_KQueue.hsc) = 24b36b21eec74087eb875d205b85cebd3338a2fe
 SHA1 (patch-libraries_ghc-internal_src_GHC_Internal_System_Environment.hs) = 0c1d7f0e8561526cc00f0e069d6921689b63d919
 SHA1 (patch-libraries_ghc-internal_src_GHC_Internal_System_Environment_Blank.hsc) = 3eb8a30bc254b90244e2d45d4bafd09bfc188f03

Added files:

Index: pkgsrc/lang/ghc910/patches/patch-libraries_base_src_System_CPUTime.hsc
diff -u /dev/null pkgsrc/lang/ghc910/patches/patch-libraries_base_src_System_CPUTime.hsc:1.1
--- /dev/null   Wed Mar  5 03:33:59 2025
+++ pkgsrc/lang/ghc910/patches/patch-libraries_base_src_System_CPUTime.hsc      Wed Mar  5 03:33:59 2025
@@ -0,0 +1,17 @@
+$NetBSD: patch-libraries_base_src_System_CPUTime.hsc,v 1.1 2025/03/05 03:33:59 pho Exp $
+
+Use clock_getres(CLOCK_PROCESS_CPUTIME_ID) only if it's confirmed to
+work. See also patch-libraries_ghc-internal_configure.ac.
+
+--- libraries/base/src/System/CPUTime.hsc.orig 2025-03-04 14:31:13.949097136 +0000
++++ libraries/base/src/System/CPUTime.hsc
+@@ -38,7 +38,8 @@ import qualified System.CPUTime.Windows 
+ #elif defined(javascript_HOST_ARCH)
+ import qualified System.CPUTime.Javascript as I
+ 
+-#elif _POSIX_TIMERS > 0 && defined(_POSIX_CPUTIME) && _POSIX_CPUTIME >= 0
++#elif _POSIX_TIMERS > 0 && defined(_POSIX_CPUTIME) && _POSIX_CPUTIME >= 0 \
++  && defined(CLOCK_GETRES_SUPPORTS_CLOCK_PROCESS_CPUTIME_ID)
+ import qualified System.CPUTime.Posix.ClockGetTime as I
+ 
+ #elif defined(HAVE_GETRUSAGE) && ! solaris2_HOST_OS

Index: pkgsrc/lang/ghc910/patches/patch-libraries_ghc-internal_configure.ac
diff -u /dev/null pkgsrc/lang/ghc910/patches/patch-libraries_ghc-internal_configure.ac:1.3
--- /dev/null   Wed Mar  5 03:33:59 2025
+++ pkgsrc/lang/ghc910/patches/patch-libraries_ghc-internal_configure.ac        Wed Mar  5 03:33:59 2025
@@ -0,0 +1,38 @@
+$NetBSD: patch-libraries_ghc-internal_configure.ac,v 1.3 2025/03/05 03:33:59 pho Exp $
+
+Detect the case where clock_getres(2) doesn't support
+CLOCK_PROCESS_CPUTIME_ID. This is conceptually not OS-specific but I (pho@)
+don't think it's worth upstreaming. See
+https://gnats.netbsd.org/cgi-bin/query-pr-single.pl?number=59127 for the
+background.
+
+See also patch-libraries_base_src_System_CPUTime.hsc
+
+--- libraries/ghc-internal/configure.ac.orig   2025-03-04 13:58:17.963896190 +0000
++++ libraries/ghc-internal/configure.ac
+@@ -113,6 +113,25 @@ case "$fptools_cv_func_unsetenv_return_t
+   ;;
+ esac
+ 
++AC_MSG_CHECKING([if clock_getres(CLOCK_PROCESS_CPUTIME_ID) works])
++AC_RUN_IFELSE(
++  [AC_LANG_PROGRAM(
++     [@%:@include <time.h>],
++     [struct timespec ts;
++      int rv;
++      rv = clock_getres(CLOCK_PROCESS_CPUTIME_ID, &ts);
++      return rv;])],
++  [clock_getres_supports_proc_cputime=yes],
++  [clock_getres_supports_proc_cputime=no],
++  [clock_getres_supports_proc_cputime=no])
++if test x"$clock_getres_supports_proc_cputime" = x"yes"; then
++  AC_MSG_RESULT([yes])
++  AC_DEFINE([CLOCK_GETRES_SUPPORTS_CLOCK_PROCESS_CPUTIME_ID], [1],
++            [Define if clock_getres(2) works with CLOCK_PROCESS_CPUTIME_ID])
++else
++  AC_MSG_RESULT([no])
++fi
++
+ dnl--------------------------------------------------------------------
+ dnl * Deal with arguments telling us iconv is somewhere odd
+ dnl--------------------------------------------------------------------