CVS commit: pkgsrc/lang/ghc84

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

Module Name:    pkgsrc
Committed By:   pho
Date:           Tue Jan 14 14:44:50 UTC 2020

Modified Files:
        pkgsrc/lang/ghc84: Makefile bootstrap.mk distinfo
        pkgsrc/lang/ghc84/patches: patch-configure.ac

Log Message:
Add a bootkit for FreeBSD/amd64


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/lang/ghc84/Makefile \
    pkgsrc/lang/ghc84/bootstrap.mk pkgsrc/lang/ghc84/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/ghc84/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/ghc84/Makefile
diff -u pkgsrc/lang/ghc84/Makefile:1.3 pkgsrc/lang/ghc84/Makefile:1.4
--- pkgsrc/lang/ghc84/Makefile:1.3      Mon Jan 13 14:15:11 2020
+++ pkgsrc/lang/ghc84/Makefile  Tue Jan 14 14:44:50 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2020/01/13 14:15:11 pho Exp $
+# $NetBSD: Makefile,v 1.4 2020/01/14 14:44:50 pho Exp $
 # -----------------------------------------------------------------------------
 # Package metadata
 #
@@ -23,6 +23,7 @@ CONFLICTS+=   ghc-[0-9]*
 #BROKEN_EXCEPT_ON_PLATFORM+=   Darwin-*-powerpc # Not available yet
 BROKEN_EXCEPT_ON_PLATFORM+=    Darwin-*-x86_64
 BROKEN_EXCEPT_ON_PLATFORM+=    FreeBSD-*-i386
+BROKEN_EXCEPT_ON_PLATFORM+=    FreeBSD-*-x86_64
 BROKEN_EXCEPT_ON_PLATFORM+=    NetBSD-*-x86_64
 #BROKEN_EXCEPT_ON_PLATFORM+=   SunOS-*-i386     # Not available yet
 #BROKEN_EXCEPT_ON_PLATFORM+=   SunOS-*-x86_64   # Not available yet
Index: pkgsrc/lang/ghc84/bootstrap.mk
diff -u pkgsrc/lang/ghc84/bootstrap.mk:1.3 pkgsrc/lang/ghc84/bootstrap.mk:1.4
--- pkgsrc/lang/ghc84/bootstrap.mk:1.3  Mon Jan 13 14:15:11 2020
+++ pkgsrc/lang/ghc84/bootstrap.mk      Tue Jan 14 14:44:50 2020
@@ -1,4 +1,4 @@
-# $NetBSD: bootstrap.mk,v 1.3 2020/01/13 14:15:11 pho Exp $
+# $NetBSD: bootstrap.mk,v 1.4 2020/01/14 14:44:50 pho Exp $
 # -----------------------------------------------------------------------------
 # Select a bindist of bootstrapping compiler on a per-platform basis.
 #
@@ -36,6 +36,12 @@ BOOT_ARCHIVE:=       ghc-${BOOT_VERSION}-boot-
 DISTFILES:=    ${DISTFILES} ${BOOT_ARCHIVE} # Available in LOCAL_PORTS
 .endif
 
+.if !empty(MACHINE_PLATFORM:MFreeBSD-*-x86_64) || make(distinfo) || make(makesum) || make(mdi)
+BOOT_VERSION:= 8.4.4
+BOOT_ARCHIVE:= ghc-${BOOT_VERSION}-boot-x86_64-unknown-freebsd.tar.xz
+DISTFILES:=    ${DISTFILES} ${BOOT_ARCHIVE} # Available in LOCAL_PORTS
+.endif
+
 .if !empty(MACHINE_PLATFORM:MNetBSD-*-x86_64) || make(distinfo) || make (makesum) || make(mdi)
 BOOT_VERSION:= 8.4.4
 BOOT_ARCHIVE:= ghc-${BOOT_VERSION}-boot-x86_64-unknown-netbsd.tar.xz
Index: pkgsrc/lang/ghc84/distinfo
diff -u pkgsrc/lang/ghc84/distinfo:1.3 pkgsrc/lang/ghc84/distinfo:1.4
--- pkgsrc/lang/ghc84/distinfo:1.3      Mon Jan 13 14:15:11 2020
+++ pkgsrc/lang/ghc84/distinfo  Tue Jan 14 14:44:50 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2020/01/13 14:15:11 pho Exp $
+$NetBSD: distinfo,v 1.4 2020/01/14 14:44:50 pho 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
@@ -8,6 +8,10 @@ SHA1 (ghc-8.4.4-boot-x86_64-apple-darwin
 RMD160 (ghc-8.4.4-boot-x86_64-apple-darwin.tar.xz) = 4e9c52c8ef07343cc24528e3f8431754237d0be3
 SHA512 (ghc-8.4.4-boot-x86_64-apple-darwin.tar.xz) = abc92ca6822ba7fe2d09bc381a833c0cbd5f436b517fba003736195cec45f8ce2e33623a587ad35f5702baac791594d62fc829e2ea4dfceae2455875661b3ba6
 Size (ghc-8.4.4-boot-x86_64-apple-darwin.tar.xz) = 51700444 bytes
+SHA1 (ghc-8.4.4-boot-x86_64-unknown-freebsd.tar.xz) = e16fcc19bc76eed3de81dd14064fd427d4f04c93
+RMD160 (ghc-8.4.4-boot-x86_64-unknown-freebsd.tar.xz) = 5e6eb0ca293c96dd7fa33e3ab8dc3541e2e2f441
+SHA512 (ghc-8.4.4-boot-x86_64-unknown-freebsd.tar.xz) = 2eccb6c0a64d505363cb340e9a603c744c48c59202a00f4c535ba0b278908fe58c126d7bfc3ae233ec097febfa3c395c3622a4cb4270b85af5189f2ceeda664a
+Size (ghc-8.4.4-boot-x86_64-unknown-freebsd.tar.xz) = 53872384 bytes
 SHA1 (ghc-8.4.4-boot-x86_64-unknown-netbsd.tar.xz) = bc7b0e203a6e7e6804c4be46957352d032cd22ec
 RMD160 (ghc-8.4.4-boot-x86_64-unknown-netbsd.tar.xz) = dd50835c50cd2102c1af4d2ed8f1148c8ac4d4d9
 SHA512 (ghc-8.4.4-boot-x86_64-unknown-netbsd.tar.xz) = 0cc836390985c56d79a5c08dd2117c53fc9802b969db408dab14cfd441d95b2b5c18fed5d0b6da8a8555501e668ba471d0b878ea11a0021fba76265ed4ef8f76
@@ -17,7 +21,7 @@ RMD160 (ghc-8.4.4-src.tar.xz) = d2be33c4
 SHA512 (ghc-8.4.4-src.tar.xz) = 685e102eee8cf8b6a377afd7871998c8c368a5da288469367e3fb804aa6109e6f59be5945b8cd3d1e36c851190ea9a7f74c576528589589313d237b721d86da5
 Size (ghc-8.4.4-src.tar.xz) = 11319500 bytes
 SHA1 (patch-aclocal.m4) = 848cf4e1fdc8ccd066f5edca1eeef27182d13312
-SHA1 (patch-configure.ac) = f521200b519fdaab1082c4a2fcac9c3dd9135d7b
+SHA1 (patch-configure.ac) = a6e0fe61f6a9237c0b3e3a1dd489af761ce041fb
 SHA1 (patch-libraries_base_GHC_Event_KQueue.hsc) = 8ee5da667a241a05fde3c580d3dc9bdc05aa5f00
 SHA1 (patch-libraries_base_System_CPUTime_Posix_Times.hsc) = 2bfb779d534d12073287274ce5e90b99e457a860
 SHA1 (patch-libraries_base_System_Environment.hs) = 7d79a91f295915b4408d5f41d5405739d7189215

Index: pkgsrc/lang/ghc84/patches/patch-configure.ac
diff -u pkgsrc/lang/ghc84/patches/patch-configure.ac:1.1 pkgsrc/lang/ghc84/patches/patch-configure.ac:1.2
--- pkgsrc/lang/ghc84/patches/patch-configure.ac:1.1    Tue Jan  7 16:52:09 2020
+++ pkgsrc/lang/ghc84/patches/patch-configure.ac        Tue Jan 14 14:44:50 2020
@@ -1,8 +1,13 @@
-$NetBSD: patch-configure.ac,v 1.1 2020/01/07 16:52:09 pho Exp $
+$NetBSD: patch-configure.ac,v 1.2 2020/01/14 14:44:50 pho Exp $
 
-Don't use non-portable operator ==.
+Hunk #0:
+  Don't use non-portable operator ==.
 
---- configure.ac.orig  2020-01-04 08:10:34.453377650 +0000
+
+Hunk #1:
+  Fix build on FreeBSD/amd64.
+
+--- configure.ac.orig  2018-10-13 19:49:38.000000000 +0000
 +++ configure.ac
 @@ -914,7 +914,7 @@ FP_CHECK_SIZEOF_AND_ALIGNMENT(uint64_t)
  
@@ -13,3 +18,15 @@ Don't use non-portable operator ==.
    AC_SUBST([Cabal64bit],[True])
  else
    AC_SUBST([Cabal64bit],[False])
+@@ -1172,6 +1172,11 @@ if test "$ac_cv_sizeof_void_p" -eq 8 ; then
+           # as of OpenBSD 5.8 (2015), OpenBSD does not support mmap with MAP_NORESERVE.
+           # The flag MAP_NORESERVE is supported for source compatibility reasons,
+           # but is completely ignored by OS mmap
++            use_large_address_space=no
++        elif test "$ghc_host_os" = "freebsd" ; then
++            # FreeBSD doesn't support MAP_NORESERVE. The flag
++            # MAP_NORESERVE is supported for source compatibility
++            # reasons, but is completely ignored by OS mmap
+             use_large_address_space=no
+         else
+             AC_CHECK_DECLS([MAP_NORESERVE, MADV_FREE, MADV_DONTNEED],[],[],