CVS commit: pkgsrc/lang/ghc7

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

Module Name:    pkgsrc
Committed By:   pho
Date:           Tue Dec 31 07:10:30 UTC 2019

Modified Files:
        pkgsrc/lang/ghc7: Makefile distinfo
Added Files:
        pkgsrc/lang/ghc7/patches: patch-libraries_unix_System_Posix_Env.hsc
            patch-libraries_unix_System_Posix_Env_ByteString.hsc

Log Message:
More patches to suppress linker warnings


To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 pkgsrc/lang/ghc7/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/lang/ghc7/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/lang/ghc7/patches/patch-libraries_unix_System_Posix_Env.hsc \
    pkgsrc/lang/ghc7/patches/patch-libraries_unix_System_Posix_Env_ByteString.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/ghc7/Makefile
diff -u pkgsrc/lang/ghc7/Makefile:1.37 pkgsrc/lang/ghc7/Makefile:1.38
--- pkgsrc/lang/ghc7/Makefile:1.37      Sun Dec 29 16:59:08 2019
+++ pkgsrc/lang/ghc7/Makefile   Tue Dec 31 07:10:30 2019
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.37 2019/12/29 16:59:08 pho Exp $
+# $NetBSD: Makefile,v 1.38 2019/12/31 07:10:30 pho Exp $
 # -----------------------------------------------------------------------------
 # Package metadata
 #
 DISTNAME=      ghc-7.10.3-src
+PKGREVISION=   1
 PKGNAME=       ${DISTNAME:S/-src$//}
 CATEGORIES=    lang
 MASTER_SITES=  https://downloads.haskell.org/~ghc/${PKGVERSION_NOREV}/

Index: pkgsrc/lang/ghc7/distinfo
diff -u pkgsrc/lang/ghc7/distinfo:1.17 pkgsrc/lang/ghc7/distinfo:1.18
--- pkgsrc/lang/ghc7/distinfo:1.17      Sun Dec 29 16:59:08 2019
+++ pkgsrc/lang/ghc7/distinfo   Tue Dec 31 07:10:30 2019
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.17 2019/12/29 16:59:08 pho Exp $
+$NetBSD: distinfo,v 1.18 2019/12/31 07:10:30 pho Exp $
 
 SHA1 (ghc-7.10.3-boot-x86_64-unknown-netbsd.tar.xz) = 2e054dea1d6ad9871774b157939d73df22a82b75
 RMD160 (ghc-7.10.3-boot-x86_64-unknown-netbsd.tar.xz) = ca78f280a02302ac5056e503a01d79bd5e5c1e81
@@ -29,6 +29,8 @@ SHA1 (patch-libraries_base_GHC_Event_KQu
 SHA1 (patch-libraries_base_System_Environment.hs) = fd786a7aa2058b5d86d4646e3816fb53ea0bf59f
 SHA1 (patch-libraries_base_configure.ac) = dd6132c5335d7e0421ec2181ebb5a34bb162e255
 SHA1 (patch-libraries_time_lib_Data_Time_Clock_CTimeval.hs) = 79f17fe77cc5469a90c811682a937c8d711d59c5
+SHA1 (patch-libraries_unix_System_Posix_Env.hsc) = 87bcd3b401fce656025777357a26a1ae514fd28d
+SHA1 (patch-libraries_unix_System_Posix_Env_ByteString.hsc) = 2ce83b35734244d49b037f8cac5eaa9d548f778c
 SHA1 (patch-libraries_unix_System_Posix_Files_Common.hsc) = a80945863d7bd8f5f65af5371d3ab090071ea24e
 SHA1 (patch-libraries_unix_System_Posix_Signals.hsc) = 6a2b9a527730ec593b70e827fdc1aaeccc575dad
 SHA1 (patch-libraries_unix_include_execvpe.h) = a134be89b4bdd49eb5c5ed45756eb3a4ce5951a5

Added files:

Index: pkgsrc/lang/ghc7/patches/patch-libraries_unix_System_Posix_Env.hsc
diff -u /dev/null pkgsrc/lang/ghc7/patches/patch-libraries_unix_System_Posix_Env.hsc:1.1
--- /dev/null   Tue Dec 31 07:10:30 2019
+++ pkgsrc/lang/ghc7/patches/patch-libraries_unix_System_Posix_Env.hsc  Tue Dec 31 07:10:30 2019
@@ -0,0 +1,24 @@
+$NetBSD: patch-libraries_unix_System_Posix_Env.hsc,v 1.1 2019/12/31 07:10:30 pho Exp $
+
+Suppress linker warnings about compatibility symbols by using "capi"
+instead of "ccall".
+
+--- libraries/unix/System/Posix/Env.hsc.orig   2019-12-31 00:05:02.553011557 +0000
++++ libraries/unix/System/Posix/Env.hsc
+@@ -3,6 +3,7 @@
+ #elif __GLASGOW_HASKELL__ >= 703
+ {-# LANGUAGE Trustworthy #-}
+ #endif
++{-# LANGUAGE CApiFFI #-}
+ -----------------------------------------------------------------------------
+ -- |
+ -- Module      :  System.Posix.Env
+@@ -142,7 +143,7 @@ putEnv keyvalue = do s <- newFilePath ke
+       newFilePath fp = getFileSystemEncoding >>= \enc -> GHC.newCString enc fp
+ #endif
+ 
+-foreign import ccall unsafe "putenv"
++foreign import capi unsafe "stdlib.h putenv"
+    c_putenv :: CString -> IO CInt
+ 
+ {- |The 'setEnv' function inserts or resets the environment variable name in
Index: pkgsrc/lang/ghc7/patches/patch-libraries_unix_System_Posix_Env_ByteString.hsc
diff -u /dev/null pkgsrc/lang/ghc7/patches/patch-libraries_unix_System_Posix_Env_ByteString.hsc:1.1
--- /dev/null   Tue Dec 31 07:10:30 2019
+++ pkgsrc/lang/ghc7/patches/patch-libraries_unix_System_Posix_Env_ByteString.hsc       Tue Dec 31 07:10:30 2019
@@ -0,0 +1,24 @@
+$NetBSD: patch-libraries_unix_System_Posix_Env_ByteString.hsc,v 1.1 2019/12/31 07:10:30 pho Exp $
+
+Suppress linker warnings about compatibility symbols by using "capi"
+instead of "ccall".
+
+--- libraries/unix/System/Posix/Env/ByteString.hsc.orig        2019-12-31 00:06:05.528517546 +0000
++++ libraries/unix/System/Posix/Env/ByteString.hsc
+@@ -4,6 +4,7 @@
+ {-# OPTIONS_GHC -fno-warn-trustworthy-safe #-}
+ #endif
+ #endif
++{-# LANGUAGE CApiFFI #-}
+ 
+ -----------------------------------------------------------------------------
+ -- |
+@@ -118,7 +119,7 @@ putEnv :: ByteString -> IO ()
+ putEnv keyvalue = B.useAsCString keyvalue $ \s ->
+   throwErrnoIfMinus1_ "putenv" (c_putenv s)
+ 
+-foreign import ccall unsafe "putenv"
++foreign import capi unsafe "stdlib.h putenv"
+    c_putenv :: CString -> IO CInt
+ 
+ {- |The 'setEnv' function inserts or resets the environment variable name in