CVS commit: pkgsrc/lang/ghc94

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/lang/ghc94
From: "Masatake Daimon" <pho%netbsd.org@localhost>
Date: Mon, 9 Oct 2023 02:49:53 +0000

Module Name:    pkgsrc
Committed By:   pho
Date:           Mon Oct  9 02:49:53 UTC 2023

Modified Files:
        pkgsrc/lang/ghc94: Makefile buildlink3.mk distinfo
        pkgsrc/lang/ghc94/patches:
            patch-libraries_process_cbits_posix_fork__exec.c
            patch-libraries_text_text.cabal
Removed Files:
        pkgsrc/lang/ghc94: hacks.mk

Log Message:
lang/ghc94: Update to GHC 9.4.7

Release notes:
9.4.5: https://downloads.haskell.org/~ghc/9.4.5/docs/users_guide/9.4.5-notes.html
9.4.6: https://downloads.haskell.org/~ghc/9.4.6/docs/users_guide/9.4.6-notes.html
9.4.7: https://downloads.haskell.org/~ghc/9.4.7/docs/users_guide/9.4.7-notes.html


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 pkgsrc/lang/ghc94/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/lang/ghc94/buildlink3.mk
cvs rdiff -u -r1.12 -r1.13 pkgsrc/lang/ghc94/distinfo
cvs rdiff -u -r1.2 -r0 pkgsrc/lang/ghc94/hacks.mk
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/lang/ghc94/patches/patch-libraries_process_cbits_posix_fork__exec.c
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/lang/ghc94/patches/patch-libraries_text_text.cabal

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

Modified files:

Index: pkgsrc/lang/ghc94/Makefile
diff -u pkgsrc/lang/ghc94/Makefile:1.8 pkgsrc/lang/ghc94/Makefile:1.9
--- pkgsrc/lang/ghc94/Makefile:1.8      Mon Aug 14 05:24:44 2023
+++ pkgsrc/lang/ghc94/Makefile  Mon Oct  9 02:49:52 2023
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2023/08/14 05:24:44 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2023/10/09 02:49:52 pho Exp $
 # -----------------------------------------------------------------------------
 # Package metadata
 #
-DISTNAME=      ghc-9.4.4-src
+DISTNAME=      ghc-9.4.7-src
 PKGNAME=       ${DISTNAME:S/-src$//}
-PKGREVISION=   3
 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.3 pkgsrc/lang/ghc94/buildlink3.mk:1.4
--- pkgsrc/lang/ghc94/buildlink3.mk:1.3 Mon Aug 14 05:24:44 2023
+++ pkgsrc/lang/ghc94/buildlink3.mk     Mon Oct  9 02:49:52 2023
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.3 2023/08/14 05:24:44 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2023/10/09 02:49:52 pho Exp $
 
 BUILDLINK_TREE+=       ghc
 
 .if !defined(GHC_BUILDLINK3_MK)
 GHC_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.ghc+=    ghc>=9.4.4
-BUILDLINK_ABI_DEPENDS.ghc+=    ghc>=9.4.4nb3
+BUILDLINK_API_DEPENDS.ghc+=    ghc>=9.4.7
+BUILDLINK_ABI_DEPENDS.ghc+=    ghc>=9.4.7
 BUILDLINK_PKGSRCDIR.ghc?=      ../../lang/ghc94
 
 .include "../../converters/libiconv/buildlink3.mk"

Index: pkgsrc/lang/ghc94/distinfo
diff -u pkgsrc/lang/ghc94/distinfo:1.12 pkgsrc/lang/ghc94/distinfo:1.13
--- pkgsrc/lang/ghc94/distinfo:1.12     Tue Feb  7 10:42:17 2023
+++ pkgsrc/lang/ghc94/distinfo  Mon Oct  9 02:49:52 2023
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.12 2023/02/07 10:42:17 jperkin Exp $
+$NetBSD: distinfo,v 1.13 2023/10/09 02:49:52 pho Exp $
 
 BLAKE2s (ghc-9.0.1-boot-hadrian.tar.gz) = fff7259676e3d0281c7e15e684b65dc04313c9bcb4d6161962325c3fcee08c7b
 SHA512 (ghc-9.0.1-boot-hadrian.tar.gz) = 02047ca0718a240ce702aeac16c2194b6bf73119dacb59816c1e9a631667e420e44c6ef6d5b83f225af3bd31e3ec3fc8f28e9a3cb22e86f63089110429759878
@@ -24,9 +24,9 @@ Size (ghc-9.2.1-boot-x86_64-unknown-netb
 BLAKE2s (ghc-9.2.1-boot-x86_64-unknown-solaris2.tar.xz) = 1d70d79ad765f0222e27f0a98915231d75dcb61b1ba4fb044ab531bc9930dc5f
 SHA512 (ghc-9.2.1-boot-x86_64-unknown-solaris2.tar.xz) = 7e55f4a002808aa1ae3c6053b129f0f0c0ac2d9f6b9ad5e4fc7c0fa9a09defeea2ed46a7e8d4c5a81213b631aacfa4cdd92b3bc724a6ee4de8b9d201840f3185
 Size (ghc-9.2.1-boot-x86_64-unknown-solaris2.tar.xz) = 69490428 bytes
-BLAKE2s (ghc-9.4.4-src.tar.xz) = d77e26d73dfd2c96130a17c89c9fa361d71493d228eab8e919e2b79ee1783f3f
-SHA512 (ghc-9.4.4-src.tar.xz) = 6c9df7279a30b546bbd30a330905b3bdec31531e1343aa24bad721792235472857153e7f5d8d79e109ed63a314a1a4a647b66510e91eba4627c6806ae5c1fca2
-Size (ghc-9.4.4-src.tar.xz) = 28564104 bytes
+BLAKE2s (ghc-9.4.7-src.tar.xz) = e6afd6da016256bfa07a83cde66a006f6f77ebdc81231872f1c574dd24158bd4
+SHA512 (ghc-9.4.7-src.tar.xz) = 0fa2b864e90e6b76fa5a12b7ab417c0b945653707cdbc4942fbba58f93baee43b6160bb23aa0aa1282907022956275fa5469875059a743f181987d1b067f30e2
+Size (ghc-9.4.7-src.tar.xz) = 28618472 bytes
 BLAKE2s (netbsd-9.0-amd64-libterminfo.tar.gz) = cf57e942d3331df269d8668bc09c59e8a81fbdfa5bb6c671d758d367a23c84ce
 SHA512 (netbsd-9.0-amd64-libterminfo.tar.gz) = 79288d44b84df8848afc2cdfee628cc4fd1ec0334159403ef8ba994d617bc56a7114af3031198afb5f3b8f45c0463a848099431e32bc6725042908576b6f95b8
 Size (netbsd-9.0-amd64-libterminfo.tar.gz) = 27744 bytes
@@ -48,9 +48,9 @@ SHA1 (patch-libraries_base_System_Enviro
 SHA1 (patch-libraries_base_System_Environment_ExecutablePath.hsc) = 30baa7f76f20d449feea0f634ca6b90e04d9481e
 SHA1 (patch-libraries_base_configure) = 4e02082cdfde8d927d12f3d2f3d98ace6d4ee116
 SHA1 (patch-libraries_ghc-boot_GHC_BaseDir.hs) = 6885d0426eb4c09462b6628924a0801fe6c83a2f
-SHA1 (patch-libraries_process_cbits_posix_fork__exec.c) = 7c460239c76ee1a05ae364752f7216973597075a
+SHA1 (patch-libraries_process_cbits_posix_fork__exec.c) = 8bc8aa1a3cfe8101257f77da98e5f877c59a36b0
 SHA1 (patch-libraries_terminfo_configure.ac) = f9b1fbf3b7204af0ec2c2c21b1edab9592ff032d
-SHA1 (patch-libraries_text_text.cabal) = 5cfa19359cbdca7c836abae60302addd5e3e4218
+SHA1 (patch-libraries_text_text.cabal) = 2c7302c6854509fe7fd4955f02e5f066d060501e
 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) = e94936c139ca15d45cac4a7feb74a601567913ab

Index: pkgsrc/lang/ghc94/patches/patch-libraries_process_cbits_posix_fork__exec.c
diff -u pkgsrc/lang/ghc94/patches/patch-libraries_process_cbits_posix_fork__exec.c:1.2 pkgsrc/lang/ghc94/patches/patch-libraries_process_cbits_posix_fork__exec.c:1.3
--- pkgsrc/lang/ghc94/patches/patch-libraries_process_cbits_posix_fork__exec.c:1.2      Sat Jan 21 13:20:34 2023
+++ pkgsrc/lang/ghc94/patches/patch-libraries_process_cbits_posix_fork__exec.c  Mon Oct  9 02:49:52 2023
@@ -1,17 +1,20 @@
-$NetBSD: patch-libraries_process_cbits_posix_fork__exec.c,v 1.2 2023/01/21 13:20:34 pho Exp $
+$NetBSD: patch-libraries_process_cbits_posix_fork__exec.c,v 1.3 2023/10/09 02:49:52 pho Exp $
 
 Ensure _POSIX_PTHREAD_SEMANTICS is defined on SunOS.
 
 Pull request:
 https://github.com/haskell/process/pull/274
 
---- libraries/process/cbits/posix/fork_exec.c.orig     2021-10-28 20:42:10.000000000 +0000
+--- libraries/process/cbits/posix/fork_exec.c.orig     2023-08-21 03:50:41.000000000 +0000
 +++ libraries/process/cbits/posix/fork_exec.c
-@@ -1,3 +1,7 @@
+@@ -1,6 +1,10 @@
+ /* ensure that execvpe is provided if possible */
+ #define _GNU_SOURCE 1
+ 
 +#ifdef __sun
 +#define _POSIX_PTHREAD_SEMANTICS
 +#endif
 +
  #include "common.h"
  
- #include <sys/types.h>
+ #if defined(HAVE_FORK)

Index: pkgsrc/lang/ghc94/patches/patch-libraries_text_text.cabal
diff -u pkgsrc/lang/ghc94/patches/patch-libraries_text_text.cabal:1.1 pkgsrc/lang/ghc94/patches/patch-libraries_text_text.cabal:1.2
--- pkgsrc/lang/ghc94/patches/patch-libraries_text_text.cabal:1.1       Sat Jan 21 04:49:25 2023
+++ pkgsrc/lang/ghc94/patches/patch-libraries_text_text.cabal   Mon Oct  9 02:49:52 2023
@@ -1,10 +1,10 @@
-$NetBSD: patch-libraries_text_text.cabal,v 1.1 2023/01/21 04:49:25 pho Exp $
+$NetBSD: patch-libraries_text_text.cabal,v 1.2 2023/10/09 02:49:52 pho Exp $
 
 This is a temporary workaround for aarch64 codegen bug in 9.2.1. Once we
 update our bootkit for aarch64 we can remove this.
 https://gitlab.haskell.org/ghc/ghc/-/issues/20594
 
---- libraries/text/text.cabal.orig     2022-12-23 16:19:54.000000000 +0000
+--- libraries/text/text.cabal.orig     2023-08-21 03:50:41.000000000 +0000
 +++ libraries/text/text.cabal
 @@ -127,10 +127,6 @@ library
    if (arch(aarch64) || arch(arm)) && impl(ghc == 8.10.*)
@@ -14,6 +14,6 @@ https://gitlab.haskell.org/ghc/ghc/-/iss
 -  if (arch(aarch64) || arch(arm)) && impl(ghc == 9.2.1)
 -    build-depends: base < 0
 -
-   exposed-modules:
-     Data.Text
-     Data.Text.Array
+   -- NetBSD + GHC 9.2.1 + TH + C++ does not work together.
+   -- https://gitlab.haskell.org/ghc/ghc/-/issues/22577
+   if flag(simdutf) && os(netbsd) && impl(ghc < 9.4)

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index