CVS commit: pkgsrc/lang/ghc98

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Mon Feb  2 22:52:49 UTC 2026

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

Log Message:
ghc98: 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.12 -r1.13 pkgsrc/lang/ghc98/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/lang/ghc98/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/lang/ghc98/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/ghc98/Makefile
diff -u pkgsrc/lang/ghc98/Makefile:1.12 pkgsrc/lang/ghc98/Makefile:1.13
--- pkgsrc/lang/ghc98/Makefile:1.12     Tue Jan  6 11:18:44 2026
+++ pkgsrc/lang/ghc98/Makefile  Mon Feb  2 22:52:49 2026
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.12 2026/01/06 11:18:44 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2026/02/02 22:52:49 wiz Exp $
 # -----------------------------------------------------------------------------
 # Package metadata
 #
 DISTNAME=      ghc-9.8.2-src
 PKGNAME=       ${DISTNAME:S/-src$//}
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    lang
 MASTER_SITES=  https://downloads.haskell.org/~ghc/${PKGVERSION_NOREV}/
 EXTRACT_SUFX=  .tar.xz

Index: pkgsrc/lang/ghc98/distinfo
diff -u pkgsrc/lang/ghc98/distinfo:1.18 pkgsrc/lang/ghc98/distinfo:1.19
--- pkgsrc/lang/ghc98/distinfo:1.18     Mon Feb  3 16:25:01 2025
+++ pkgsrc/lang/ghc98/distinfo  Mon Feb  2 22:52:49 2026
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.18 2025/02/03 16:25:01 jperkin Exp $
+$NetBSD: distinfo,v 1.19 2026/02/02 22:52:49 wiz Exp $
 
 BLAKE2s (ghc-9.8.2-boot-aarch64-apple-darwin.tar.xz) = 45867db56f03b0c25a13f034dd3eca3a91cc1b031790e457a55f599b023827ba
 SHA512 (ghc-9.8.2-boot-aarch64-apple-darwin.tar.xz) = c9b8717b0e37fd7c0fcff4f3dac603673fabe235bc8257cc24200ca926b7d2a226f656b8ffd13c1e6c0260f73a162d81b19a4f866b7c34d1ea54cdddef3aa406
@@ -47,7 +47,7 @@ SHA1 (patch-libraries_base_System_CPUTim
 SHA1 (patch-libraries_base_System_Environment.hs) = 7d79a91f295915b4408d5f41d5405739d7189215
 SHA1 (patch-libraries_base_configure) = 4e02082cdfde8d927d12f3d2f3d98ace6d4ee116
 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/ghc98/patches/patch-libraries_text_cbits_measure__off.c
diff -u pkgsrc/lang/ghc98/patches/patch-libraries_text_cbits_measure__off.c:1.1 pkgsrc/lang/ghc98/patches/patch-libraries_text_cbits_measure__off.c:1.2
--- pkgsrc/lang/ghc98/patches/patch-libraries_text_cbits_measure__off.c:1.1     Wed Jan  8 14:51:06 2025
+++ pkgsrc/lang/ghc98/patches/patch-libraries_text_cbits_measure__off.c Mon Feb  2 22:52:49 2026
@@ -1,4 +1,4 @@
-$NetBSD: patch-libraries_text_cbits_measure__off.c,v 1.1 2025/01/08 14:51:06 pho Exp $
+$NetBSD: patch-libraries_text_cbits_measure__off.c,v 1.2 2026/02/02 22:52:49 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>