Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1675732857291410"
MIME-Version: 1.0
Date: Tue, 7 Feb 2023 01:20:57 +0000
From: "Masatake Daimon" <pho@netbsd.org>
Subject: CVS commit: pkgsrc/lang/ghc94
To: pkgsrc-changes@NetBSD.org
Reply-To: pho@netbsd.org
Message-Id: <20230207012057.A14BEFA90@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1675732857291410
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	pho
Date:		Tue Feb  7 01:20:57 UTC 2023

Modified Files:
	pkgsrc/lang/ghc94: Makefile buildlink3.mk
Added Files:
	pkgsrc/lang/ghc94: hacks.mk

Log Message:
lang/ghc94: Disable the use of timerfd on NetBSD 10.99

This is only a temporary workaround. It should be removed when the corresponding kernel bug is fixed.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/lang/ghc94/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/ghc94/buildlink3.mk
cvs rdiff -u -r0 -r1.1 pkgsrc/lang/ghc94/hacks.mk

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


--_----------=_1675732857291410
Content-Disposition: inline
Content-Length: 1996
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/lang/ghc94/Makefile
diff -u pkgsrc/lang/ghc94/Makefile:1.3 pkgsrc/lang/ghc94/Makefile:1.4
--- pkgsrc/lang/ghc94/Makefile:1.3	Tue Jan 24 02:49:26 2023
+++ pkgsrc/lang/ghc94/Makefile	Tue Feb  7 01:20:57 2023
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.3 2023/01/24 02:49:26 pho Exp $
+# $NetBSD: Makefile,v 1.4 2023/02/07 01:20:57 pho Exp $
 # -----------------------------------------------------------------------------
 # Package metadata
 #
 DISTNAME=	ghc-9.4.4-src
 PKGNAME=	${DISTNAME:S/-src$//}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	lang
 MASTER_SITES=	https://downloads.haskell.org/~ghc/${PKGVERSION_NOREV}/
 EXTRACT_SUFX=	.tar.xz

Index: pkgsrc/lang/ghc94/buildlink3.mk
diff -u pkgsrc/lang/ghc94/buildlink3.mk:1.1 pkgsrc/lang/ghc94/buildlink3.mk:1.2
--- pkgsrc/lang/ghc94/buildlink3.mk:1.1	Sat Jan 21 04:49:25 2023
+++ pkgsrc/lang/ghc94/buildlink3.mk	Tue Feb  7 01:20:57 2023
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2023/01/21 04:49:25 pho Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2023/02/07 01:20:57 pho Exp $
 
 BUILDLINK_TREE+=	ghc
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	ghc
 GHC_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.ghc+=	ghc>=9.4.4
-BUILDLINK_ABI_DEPENDS.ghc+=	ghc>=9.4.4
+BUILDLINK_ABI_DEPENDS.ghc+=	ghc>=9.4.4nb2
 BUILDLINK_PKGSRCDIR.ghc?=	../../lang/ghc94
 
 .include "../../converters/libiconv/buildlink3.mk"

Added files:

Index: pkgsrc/lang/ghc94/hacks.mk
diff -u /dev/null pkgsrc/lang/ghc94/hacks.mk:1.1
--- /dev/null	Tue Feb  7 01:20:57 2023
+++ pkgsrc/lang/ghc94/hacks.mk	Tue Feb  7 01:20:57 2023
@@ -0,0 +1,14 @@
+.if !defined(GHC_HACKS_MK)
+GHC_HACKS_MK=	defined
+
+### [Mon Feb  6 23:32:40 JST 2023 : pho]
+### Use of timerfd on NetBSD 10 causes a kernel panic. Disable it until
+### it's fixed:
+### https://mail-index.netbsd.org/tech-kern/2023/02/05/msg028704.html
+###
+.if !empty(MACHINE_PLATFORM:MNetBSD-10.99.*-*)
+PKG_HACKS+=	disable-timerfd
+CONFIGURE_ENV+=	ac_cv_header_sys_timerfd_h=no
+.endif
+
+.endif	# GHC_HACKS_MK


--_----------=_1675732857291410--