CVS commit: pkgsrc/benchmarks/hs-criterion-measurement

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

Module Name:    pkgsrc
Committed By:   pho
Date:           Thu May  2 05:16:58 UTC 2024

Modified Files:
        pkgsrc/benchmarks/hs-criterion-measurement: Makefile PLIST distinfo
Added Files:
        pkgsrc/benchmarks/hs-criterion-measurement/patches:
            patch-cbits_cycles.c

Log Message:
benchmarks/hs-criterion-measurement: Fix build with GHC 9.8

This breaks build with the currently default GHC 9.6. Please bear with me
until I switch the default compiler.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/benchmarks/hs-criterion-measurement/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/benchmarks/hs-criterion-measurement/PLIST \
    pkgsrc/benchmarks/hs-criterion-measurement/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/benchmarks/hs-criterion-measurement/patches/patch-cbits_cycles.c

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

Modified files:

Index: pkgsrc/benchmarks/hs-criterion-measurement/Makefile
diff -u pkgsrc/benchmarks/hs-criterion-measurement/Makefile:1.2 pkgsrc/benchmarks/hs-criterion-measurement/Makefile:1.3
--- pkgsrc/benchmarks/hs-criterion-measurement/Makefile:1.2     Thu Nov  2 06:36:10 2023
+++ pkgsrc/benchmarks/hs-criterion-measurement/Makefile Thu May  2 05:16:57 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2023/11/02 06:36:10 pho Exp $
+# $NetBSD: Makefile,v 1.3 2024/05/02 05:16:57 pho Exp $
 
 DISTNAME=      criterion-measurement-0.2.1.0
 PKGREVISION=   1
@@ -8,6 +8,13 @@ MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 COMMENT=       Criterion measurement functionality and associated types
 LICENSE=       modified-bsd
 
+# See cbits/cycles.c
+BROKEN_EXCEPT_ON_PLATFORM+=    *-*-aarch64
+BROKEN_EXCEPT_ON_PLATFORM+=    *-*-i386
+BROKEN_EXCEPT_ON_PLATFORM+=    *-*-x86_64
+BROKEN_EXCEPT_ON_PLATFORM+=    Darwin-*-*
+BROKEN_EXCEPT_ON_PLATFORM+=    Linux-*-*
+
 .include "../../converters/hs-aeson/buildlink3.mk"
 .include "../../devel/hs-base-compat/buildlink3.mk"
 .include "../../devel/hs-vector/buildlink3.mk"

Index: pkgsrc/benchmarks/hs-criterion-measurement/PLIST
diff -u pkgsrc/benchmarks/hs-criterion-measurement/PLIST:1.1 pkgsrc/benchmarks/hs-criterion-measurement/PLIST:1.2
--- pkgsrc/benchmarks/hs-criterion-measurement/PLIST:1.1        Thu Nov  2 02:32:05 2023
+++ pkgsrc/benchmarks/hs-criterion-measurement/PLIST    Thu May  2 05:16:57 2024
@@ -1,6 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2023/11/02 02:32:05 pho Exp $
-lib/criterion-measurement-${PKGVERSION}/${HS_VERSION}/package-description
-lib/criterion-measurement-${PKGVERSION}/${HS_VERSION}/package-id
+@comment $NetBSD: PLIST,v 1.2 2024/05/02 05:16:57 pho Exp $
 ${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Criterion/Measurement.dyn_hi
 lib/${HS_PLATFORM}/${HS_PKGID}/Criterion/Measurement.hi
 ${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Criterion/Measurement.p_hi
@@ -13,17 +11,17 @@ ${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKG
 lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}.a
 ${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}_p.a
 ${PLIST.shlibs}lib/${HS_PLATFORM}/libHS${HS_PKGID}-${HS_VER}.so
+lib/criterion-measurement-${PKGVERSION}/${HS_VERSION}/package-description
+lib/criterion-measurement-${PKGVERSION}/${HS_VERSION}/package-id
 share/doc/${HS_PLATFORM}/criterion-measurement-${PKGVERSION}/LICENSE
 ${PLIST.doc}share/doc/${HS_PLATFORM}/criterion-measurement-${PKGVERSION}/html/Criterion-Measurement-Types-Internal.html
 ${PLIST.doc}share/doc/${HS_PLATFORM}/criterion-measurement-${PKGVERSION}/html/Criterion-Measurement-Types.html
 ${PLIST.doc}share/doc/${HS_PLATFORM}/criterion-measurement-${PKGVERSION}/html/Criterion-Measurement.html
 ${PLIST.doc}share/doc/${HS_PLATFORM}/criterion-measurement-${PKGVERSION}/html/criterion-measurement.haddock
 ${PLIST.doc}share/doc/${HS_PLATFORM}/criterion-measurement-${PKGVERSION}/html/doc-index.html
-${PLIST.doc}share/doc/${HS_PLATFORM}/criterion-measurement-${PKGVERSION}/html/doc-index.json
 ${PLIST.doc}share/doc/${HS_PLATFORM}/criterion-measurement-${PKGVERSION}/html/haddock-bundle.min.js
 ${PLIST.doc}share/doc/${HS_PLATFORM}/criterion-measurement-${PKGVERSION}/html/index.html
 ${PLIST.doc}share/doc/${HS_PLATFORM}/criterion-measurement-${PKGVERSION}/html/linuwial.css
 ${PLIST.doc}share/doc/${HS_PLATFORM}/criterion-measurement-${PKGVERSION}/html/meta.json
 ${PLIST.doc}share/doc/${HS_PLATFORM}/criterion-measurement-${PKGVERSION}/html/quick-jump.css
-${PLIST.doc}share/doc/${HS_PLATFORM}/criterion-measurement-${PKGVERSION}/html/quick-jump.min.js
 ${PLIST.doc}share/doc/${HS_PLATFORM}/criterion-measurement-${PKGVERSION}/html/synopsis.png
Index: pkgsrc/benchmarks/hs-criterion-measurement/distinfo
diff -u pkgsrc/benchmarks/hs-criterion-measurement/distinfo:1.1 pkgsrc/benchmarks/hs-criterion-measurement/distinfo:1.2
--- pkgsrc/benchmarks/hs-criterion-measurement/distinfo:1.1     Thu Nov  2 02:32:05 2023
+++ pkgsrc/benchmarks/hs-criterion-measurement/distinfo Thu May  2 05:16:57 2024
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.1 2023/11/02 02:32:05 pho Exp $
+$NetBSD: distinfo,v 1.2 2024/05/02 05:16:57 pho Exp $
 
 BLAKE2s (criterion-measurement-0.2.1.0.tar.gz) = 65f596677ada8bfe46246ecc9b8879ca647bc6e8e708e9e4c013fbffd3d56423
 SHA512 (criterion-measurement-0.2.1.0.tar.gz) = 8fc9a16a5ef7396a005fb352383c069b65b156d9d1f7e3c3e1fa47667b4d286dcb6fad203d18f5c743eef08710300ca0871f0eabd052f3ede274829660d047b9
 Size (criterion-measurement-0.2.1.0.tar.gz) = 17823 bytes
+SHA1 (patch-cbits_cycles.c) = ce8990e352a384265028fc08a390cb1fc6fd2cf0

Added files:

Index: pkgsrc/benchmarks/hs-criterion-measurement/patches/patch-cbits_cycles.c
diff -u /dev/null pkgsrc/benchmarks/hs-criterion-measurement/patches/patch-cbits_cycles.c:1.1
--- /dev/null   Thu May  2 05:16:58 2024
+++ pkgsrc/benchmarks/hs-criterion-measurement/patches/patch-cbits_cycles.c     Thu May  2 05:16:58 2024
@@ -0,0 +1,24 @@
+$NetBSD: patch-cbits_cycles.c,v 1.1 2024/05/02 05:16:58 pho Exp $
+
+Add support for non-Darwin, non-Linux, aarch64 platforms.
+
+TODO: Upstream this.
+
+--- cbits/cycles.c.orig        2024-05-02 05:12:32.848662895 +0000
++++ cbits/cycles.c
+@@ -9,6 +9,15 @@ StgWord64 criterion_rdtsc(void)
+   return mach_absolute_time();
+ }
+ 
++#elif aarch64_HOST_ARCH
++
++StgWord64 criterion_rdtsc(void)
++{
++  StgWord64 ret;
++  __asm__ __volatile__ ("mrs %0, cntvct_el0" : "=r"(ret));
++  return ret;
++}
++
+ #elif x86_64_HOST_ARCH || i386_HOST_ARCH
+ 
+ StgWord64 criterion_rdtsc(void)