CVS commit: pkgsrc/lang/ghc98

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

Module Name:    pkgsrc
Committed By:   pho
Date:           Wed Jan  8 14:51:06 UTC 2025

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

Log Message:
lang/ghc98: A better way to work around PR 58379


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/lang/ghc98/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/lang/ghc98/distinfo
cvs rdiff -u -r0 -r1.1 \
    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.7 pkgsrc/lang/ghc98/Makefile:1.8
--- pkgsrc/lang/ghc98/Makefile:1.7      Wed Jan  8 10:17:27 2025
+++ pkgsrc/lang/ghc98/Makefile  Wed Jan  8 14:51:06 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2025/01/08 10:17:27 pho Exp $
+# $NetBSD: Makefile,v 1.8 2025/01/08 14:51:06 pho Exp $
 # -----------------------------------------------------------------------------
 # Package metadata
 #
@@ -94,9 +94,6 @@ CONFIGURE_ENV+=               ac_cv_path_HSCOLOUR=
 CONFIGURE_ARGS+=       ${CONFIGURE_ARGS.common}
 CONFIGURE_ARGS+=       --with-system-libffi
 
-# workaround for http://gnats.netbsd.org/58379
-CFLAGS+=       -D__STDC_NO_ATOMICS__
-
 # CFLAGS and LDFLAGS are currently not honored by "./configure". Since
 # LDFLAGS contains rpath flags it's very important to force GHC to honor
 # it. Otherwise neither GHC itself nor executables it produces will have

Index: pkgsrc/lang/ghc98/distinfo
diff -u pkgsrc/lang/ghc98/distinfo:1.10 pkgsrc/lang/ghc98/distinfo:1.11
--- pkgsrc/lang/ghc98/distinfo:1.10     Sun May 12 05:09:57 2024
+++ pkgsrc/lang/ghc98/distinfo  Wed Jan  8 14:51:06 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2024/05/12 05:09:57 pho Exp $
+$NetBSD: distinfo,v 1.11 2025/01/08 14:51:06 pho Exp $
 
 BLAKE2s (ghc-9.4.7-boot-aarch64-apple-darwin.tar.xz) = c771cfa45f5635bdf8175775cf7a67c9541bd5b4d4927ed9b5189e3dcefcd2ba
 SHA512 (ghc-9.4.7-boot-aarch64-apple-darwin.tar.xz) = 3d50e4c6605ebfa7eef018d3e9e11e8115cf2f97e24a5adfc05fd1bab152c726e240f9a213d73e220dc7fc5b9358df74eee0d4cb1b77bd5491f28899c831b1a4
@@ -44,6 +44,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_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

Added files:

Index: pkgsrc/lang/ghc98/patches/patch-libraries_text_cbits_measure__off.c
diff -u /dev/null pkgsrc/lang/ghc98/patches/patch-libraries_text_cbits_measure__off.c:1.1
--- /dev/null   Wed Jan  8 14:51:06 2025
+++ pkgsrc/lang/ghc98/patches/patch-libraries_text_cbits_measure__off.c Wed Jan  8 14:51:06 2025
@@ -0,0 +1,26 @@
+$NetBSD: patch-libraries_text_cbits_measure__off.c,v 1.1 2025/01/08 14:51:06 pho Exp $
+
+Workaround for http://gnats.netbsd.org/58379
+
+We really need to disable the AVX-512 code path, otherwise we end up
+producing non-working binary. Patching it away is better than
+
+    CFLAGS+= -D__STDC_NO_ATOMICS__
+
+because AVX-512 being disabled is only a side effect of the macro being
+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
++++ libraries/text/cbits/measure_off.c
+@@ -13,10 +13,7 @@
+ #endif
+ #include <stdbool.h>
+ 
+-// stdatomic.h has been introduces in gcc 4.9
+-#if !(__GNUC__ >= 5 || __GNUC__ == 4 && __GNUC_MINOR__ >= 9 || defined(__clang_major__))
+ #define __STDC_NO_ATOMICS__
+-#endif
+ 
+ #ifndef __STDC_NO_ATOMICS__
+ #include <stdatomic.h>