CVS commit: pkgsrc/lang/ghc910

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Thu Jul 10 14:07:33 UTC 2025

Modified Files:
        pkgsrc/lang/ghc910: distinfo
Added Files:
        pkgsrc/lang/ghc910/patches:
            patch-libraries_haskeline_System_Console_Haskeline_Backend_Posix.hsc

Log Message:
ghc910: Fix illumos GCC 14 build.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 pkgsrc/lang/ghc910/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/lang/ghc910/patches/patch-libraries_haskeline_System_Console_Haskeline_Backend_Posix.hsc

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

Modified files:

Index: pkgsrc/lang/ghc910/distinfo
diff -u pkgsrc/lang/ghc910/distinfo:1.8 pkgsrc/lang/ghc910/distinfo:1.9
--- pkgsrc/lang/ghc910/distinfo:1.8     Wed Mar  5 03:33:59 2025
+++ pkgsrc/lang/ghc910/distinfo Thu Jul 10 14:07:33 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2025/03/05 03:33:59 pho Exp $
+$NetBSD: distinfo,v 1.9 2025/07/10 14:07:33 jperkin Exp $
 
 BLAKE2s (ghc-9.10.1-src.tar.xz) = 7e4433ead6349bd073d31803b63e6c39fb3833ad691e985e25bc5b027da7fb85
 SHA512 (ghc-9.10.1-src.tar.xz) = 46d47e7811a19dcce501002ab674d84ab2fcb842309b5094af52dc5ad26bf5b309b160c1b689f3342666013bf4b0587425c60fbd6c637e739839d41a6a96d990
@@ -50,6 +50,7 @@ SHA1 (patch-libraries_ghc-internal_confi
 SHA1 (patch-libraries_ghc-internal_src_GHC_Internal_Event_KQueue.hsc) = 24b36b21eec74087eb875d205b85cebd3338a2fe
 SHA1 (patch-libraries_ghc-internal_src_GHC_Internal_System_Environment.hs) = 0c1d7f0e8561526cc00f0e069d6921689b63d919
 SHA1 (patch-libraries_ghc-internal_src_GHC_Internal_System_Environment_Blank.hsc) = 3eb8a30bc254b90244e2d45d4bafd09bfc188f03
+SHA1 (patch-libraries_haskeline_System_Console_Haskeline_Backend_Posix.hsc) = d218f1447f9d338af406b41b01a28005cb1f843a
 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

Added files:

Index: pkgsrc/lang/ghc910/patches/patch-libraries_haskeline_System_Console_Haskeline_Backend_Posix.hsc
diff -u /dev/null pkgsrc/lang/ghc910/patches/patch-libraries_haskeline_System_Console_Haskeline_Backend_Posix.hsc:1.1
--- /dev/null   Thu Jul 10 14:07:33 2025
+++ pkgsrc/lang/ghc910/patches/patch-libraries_haskeline_System_Console_Haskeline_Backend_Posix.hsc     Thu Jul 10 14:07:33 2025
@@ -0,0 +1,18 @@
+$NetBSD: patch-libraries_haskeline_System_Console_Haskeline_Backend_Posix.hsc,v 1.1 2025/07/10 14:07:33 jperkin Exp $
+
+Correct include for ioctl() on illumos.
+
+--- libraries/haskeline/System/Console/Haskeline/Backend/Posix.hsc.orig        2024-05-10 05:07:46.000000000 +0000
++++ libraries/haskeline/System/Console/Haskeline/Backend/Posix.hsc
+@@ -69,7 +69,11 @@ ehOut = eH . hOut
+ posixLayouts :: Handles -> [IO (Maybe Layout)]
+ posixLayouts _ = error "System.Console.Haskeline.Backend.Posix.posixLayouts"
+ #else
++#if defined(__illumos__)
++foreign import capi "stropts.h ioctl" ioctl :: FD -> CULong -> Ptr a -> IO CInt
++#else
+ foreign import capi "sys/ioctl.h ioctl" ioctl :: FD -> CULong -> Ptr a -> IO CInt
++#endif
+ 
+ posixLayouts :: Handles -> [IO (Maybe Layout)]
+ posixLayouts h = [ioctlLayout $ ehOut h, envLayout]