CVS commit: pkgsrc/lang/ghc88

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

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Thu Sep 30 10:32:20 UTC 2021

Modified Files:
        pkgsrc/lang/ghc88: distinfo
        pkgsrc/lang/ghc88/patches: patch-configure.ac

Log Message:
ghc88: Copy files rather than using hardlinks.

Fixes behaviour of "ln -f" when creating bootstrap kit on SunOS.


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 pkgsrc/lang/ghc88/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/lang/ghc88/patches/patch-configure.ac

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

Modified files:

Index: pkgsrc/lang/ghc88/distinfo
diff -u pkgsrc/lang/ghc88/distinfo:1.18 pkgsrc/lang/ghc88/distinfo:1.19
--- pkgsrc/lang/ghc88/distinfo:1.18     Sat May  1 03:00:06 2021
+++ pkgsrc/lang/ghc88/distinfo  Thu Sep 30 10:32:20 2021
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.18 2021/05/01 03:00:06 pho Exp $
+$NetBSD: distinfo,v 1.19 2021/09/30 10:32:20 jperkin Exp $
 
 SHA1 (ghc-8.4.4-boot-i386-unknown-freebsd.tar.xz) = 04981802730423aa12999e59679be198d540222a
 RMD160 (ghc-8.4.4-boot-i386-unknown-freebsd.tar.xz) = f617e67f2c2f07c7211cb391a4bc2e7b304045e2
@@ -30,7 +30,7 @@ SHA512 (netbsd-9.0-amd64-libterminfo.tar
 Size (netbsd-9.0-amd64-libterminfo.tar.gz) = 27744 bytes
 SHA1 (patch-aclocal.m4) = 16ac8899a7d87cf93a6139edba9e5222eb4c5c66
 SHA1 (patch-compiler_main_DynFlags.hs) = 07bb2a5afdd087f4d2da5c035feecc13273aec70
-SHA1 (patch-configure.ac) = 6e5cec26e440ccd71343a1981b415459813f88be
+SHA1 (patch-configure.ac) = bb5bcc27efeeda7b6990cb146fc34c0242532d36
 SHA1 (patch-ghc.mk) = 1a4de0f175b0b73dc6d09a26b8c55bb6e0be0e18
 SHA1 (patch-ghc_ghc.mk) = 9c639cc95cb79e4ffbd9b5fce311edba54939b5e
 SHA1 (patch-libraries_Cabal_Cabal_Distribution_Simple_GHC.hs) = a4c82b1282c0580a7945be8c3b9d38bc760db99f

Index: pkgsrc/lang/ghc88/patches/patch-configure.ac
diff -u pkgsrc/lang/ghc88/patches/patch-configure.ac:1.3 pkgsrc/lang/ghc88/patches/patch-configure.ac:1.4
--- pkgsrc/lang/ghc88/patches/patch-configure.ac:1.3    Mon Feb 17 17:26:53 2020
+++ pkgsrc/lang/ghc88/patches/patch-configure.ac        Thu Sep 30 10:32:20 2021
@@ -1,11 +1,30 @@
-$NetBSD: patch-configure.ac,v 1.3 2020/02/17 17:26:53 jperkin Exp $
+$NetBSD: patch-configure.ac,v 1.4 2021/09/30 10:32:20 jperkin Exp $
 
 Don't use non-portable operator ==:
 https://gitlab.haskell.org/ghc/ghc/merge_requests/2497
 
---- configure.ac.orig  2019-08-25 12:03:36.000000000 +0000
+Copy files rather than relying on hardlink behaviour.
+
+--- configure.ac.orig  2020-07-12 16:04:30.000000000 +0000
 +++ configure.ac
-@@ -829,7 +829,7 @@ if test "x$EnableDtrace" = "xyes"; then
+@@ -685,11 +685,11 @@ dnl ------------------------------------
+ dnl ** Copy the files from the "fs" utility into the right folders.
+ dnl --------------------------------------------------------------
+ AC_MSG_NOTICE([Creating links for in-tree file handling routines.])
+-ln -f utils/fs/fs.* utils/lndir/
+-ln -f utils/fs/fs.* utils/unlit/
+-ln -f utils/fs/fs.* rts/
+-ln -f utils/fs/fs.h libraries/base/include/
+-ln -f utils/fs/fs.c libraries/base/cbits/
++cp -p utils/fs/fs.* utils/lndir/
++cp -p utils/fs/fs.* utils/unlit/
++cp -p utils/fs/fs.* rts/
++cp -p utils/fs/fs.h libraries/base/include/
++cp -p utils/fs/fs.c libraries/base/cbits/
+ AC_MSG_NOTICE([Routines in place. Packages can now be build normally.])
+ 
+ dnl --------------------------------------------------------------
+@@ -843,7 +843,7 @@ if test "x$EnableDtrace" = "xyes"; then
    if test -n "$DtraceCmd"; then
      if test "x$TargetOS_CPP-$TargetVendor_CPP" = "xdarwin-apple" \
        -o "x$TargetOS_CPP-$TargetVendor_CPP" = "xfreebsd-portbld" \
@@ -14,7 +33,7 @@ https://gitlab.haskell.org/ghc/ghc/merge
        HaveDtrace=YES
      fi
    fi
-@@ -936,7 +936,7 @@ FP_CHECK_SIZEOF_AND_ALIGNMENT(uint64_t)
+@@ -950,7 +950,7 @@ FP_CHECK_SIZEOF_AND_ALIGNMENT(uint64_t)
  
  dnl for use in settings.in
  TargetWordSize=$ac_cv_sizeof_void_p