CVS commit: pkgsrc/lang/ghc910

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Mon Feb  2 21:28:58 UTC 2026

Modified Files:
        pkgsrc/lang/ghc910: Makefile distinfo
        pkgsrc/lang/ghc910/patches: patch-libraries_text_cbits_measure__off.c

Log Message:
ghc910: remove AVX workaround for NetBSD 11+

Problem has been fixed as part of PR 57661.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/lang/ghc910/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/lang/ghc910/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/lang/ghc910/patches/patch-libraries_text_cbits_measure__off.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/ghc910/Makefile
diff -u pkgsrc/lang/ghc910/Makefile:1.7 pkgsrc/lang/ghc910/Makefile:1.8
--- pkgsrc/lang/ghc910/Makefile:1.7     Sun Dec 28 11:14:01 2025
+++ pkgsrc/lang/ghc910/Makefile Mon Feb  2 21:28:58 2026
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.7 2025/12/28 11:14:01 pho Exp $
+# $NetBSD: Makefile,v 1.8 2026/02/02 21:28:58 wiz Exp $
 # -----------------------------------------------------------------------------
 # Package metadata
 #
 DISTNAME=      ghc-9.10.1-src
 PKGNAME=       ${DISTNAME:S/-src$//}
-PKGREVISION=   6
+PKGREVISION=   7
 CATEGORIES=    lang
 MASTER_SITES=  https://downloads.haskell.org/~ghc/${PKGVERSION_NOREV}/
 EXTRACT_SUFX=  .tar.xz

Index: pkgsrc/lang/ghc910/distinfo
diff -u pkgsrc/lang/ghc910/distinfo:1.13 pkgsrc/lang/ghc910/distinfo:1.14
--- pkgsrc/lang/ghc910/distinfo:1.13    Sun Dec 28 07:30:17 2025
+++ pkgsrc/lang/ghc910/distinfo Mon Feb  2 21:28:58 2026
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.13 2025/12/28 07:30:17 pho Exp $
+$NetBSD: distinfo,v 1.14 2026/02/02 21:28:58 wiz Exp $
 
 BLAKE2s (ghc-9.10.1-src.tar.xz) = 7e4433ead6349bd073d31803b63e6c39fb3833ad691e985e25bc5b027da7fb85
 SHA512 (ghc-9.10.1-src.tar.xz) = 46d47e7811a19dcce501002ab674d84ab2fcb842309b5094af52dc5ad26bf5b309b160c1b689f3342666013bf4b0587425c60fbd6c637e739839d41a6a96d990
@@ -53,7 +53,7 @@ SHA1 (patch-libraries_ghc-internal_src_G
 SHA1 (patch-libraries_ghc-internal_src_GHC_Internal_System_Environment_Blank.hsc) = 3eb8a30bc254b90244e2d45d4bafd09bfc188f03
 SHA1 (patch-libraries_haskeline_System_Console_Haskeline_Backend_Posix.hsc) = d218f1447f9d338af406b41b01a28005cb1f843a
 SHA1 (patch-libraries_terminfo_configure.ac) = 068c2b89fc997a433709ec171c685654598781d7
-SHA1 (patch-libraries_text_cbits_measure__off.c) = 61bf1241fb65645abcbbbada33d41382044fe5c5
+SHA1 (patch-libraries_text_cbits_measure__off.c) = 0d944e6376fb8d75f7bfbc9c01891c7e0570168f
 SHA1 (patch-libraries_time_lib_Data_Time_Clock_Internal_CTimespec.hsc) = 588270767f8a9cbde0648fc99807891fef65d721
 SHA1 (patch-libraries_time_lib_Data_Time_Clock_Internal_CTimeval.hs) = 68914d012a98cc4a4a245efeabcb9143dba0246a
 SHA1 (patch-libraries_unix_System_Posix_Env.hsc) = 414f0310793bf184cdac7546e3f81fee4821a05f

Index: pkgsrc/lang/ghc910/patches/patch-libraries_text_cbits_measure__off.c
diff -u pkgsrc/lang/ghc910/patches/patch-libraries_text_cbits_measure__off.c:1.1 pkgsrc/lang/ghc910/patches/patch-libraries_text_cbits_measure__off.c:1.2
--- pkgsrc/lang/ghc910/patches/patch-libraries_text_cbits_measure__off.c:1.1    Wed Jan 29 13:21:54 2025
+++ pkgsrc/lang/ghc910/patches/patch-libraries_text_cbits_measure__off.c        Mon Feb  2 21:28:58 2026
@@ -1,4 +1,4 @@
-$NetBSD: patch-libraries_text_cbits_measure__off.c,v 1.1 2025/01/29 13:21:54 pho Exp $
+$NetBSD: patch-libraries_text_cbits_measure__off.c,v 1.2 2026/02/02 21:28:58 wiz Exp $
 
 Workaround for http://gnats.netbsd.org/58379
 
@@ -11,16 +11,23 @@ because AVX-512 being disabled is only a
 defined. When the upstream code changes we can be promptly notified by the
 patch not applying cleanly.
 
---- libraries/text/cbits/measure_off.c.orig    2025-01-08 14:36:12.967927622 +0000
+This was fixed for NetBSD 11, but no 10.x or 9.x releases yet (though it was
+pulled up), see PR 57661.
+
+--- libraries/text/cbits/measure_off.c.orig    2024-05-10 05:07:47.000000000 +0000
 +++ libraries/text/cbits/measure_off.c
-@@ -13,10 +13,7 @@
+@@ -13,9 +13,13 @@
  #endif
  #include <stdbool.h>
  
--// stdatomic.h has been introduces in gcc 4.9
++#ifdef __NetBSD__
++#include <sys/param.h>
++#endif
++
+ // stdatomic.h has been introduces in gcc 4.9
 -#if !(__GNUC__ >= 5 || __GNUC__ == 4 && __GNUC_MINOR__ >= 9 || defined(__clang_major__))
++#if !(__GNUC__ >= 5 || __GNUC__ == 4 && __GNUC_MINOR__ >= 9 || defined(__clang_major__)) || (defined(__NetBSD__) && (__NetBSD_Version__ < 1100000000))
  #define __STDC_NO_ATOMICS__
--#endif
+ #endif
  
  #ifndef __STDC_NO_ATOMICS__
- #include <stdatomic.h>