CVS commit: pkgsrc/lang/ghc80

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

Module Name:    pkgsrc
Committed By:   pho
Date:           Mon Jan 13 11:49:36 UTC 2020

Modified Files:
        pkgsrc/lang/ghc80: Makefile bootstrap.mk buildlink3.mk distinfo

Log Message:
Bootkit for FreeBSD/i386 is now on LOCAL_PORTS


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/ghc80/Makefile \
    pkgsrc/lang/ghc80/bootstrap.mk pkgsrc/lang/ghc80/buildlink3.mk \
    pkgsrc/lang/ghc80/distinfo

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

Modified files:

Index: pkgsrc/lang/ghc80/Makefile
diff -u pkgsrc/lang/ghc80/Makefile:1.1 pkgsrc/lang/ghc80/Makefile:1.2
--- pkgsrc/lang/ghc80/Makefile:1.1      Fri Jan  3 15:24:08 2020
+++ pkgsrc/lang/ghc80/Makefile  Mon Jan 13 11:49:36 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2020/01/03 15:24:08 pho Exp $
+# $NetBSD: Makefile,v 1.2 2020/01/13 11:49:36 pho Exp $
 # -----------------------------------------------------------------------------
 # Package metadata
 #
@@ -23,7 +23,7 @@ CONFLICTS+=   ghc-[0-9]*
 # bootstrap compilers for each platforms. If you want to build them
 # yourself, follow instructions in BOOTSTRAP.txt and ./bootstrap.mk
 #BROKEN_EXCEPT_ON_PLATFORM+= Darwin-*-powerpc # Not available yet
-#BROKEN_EXCEPT_ON_PLATFORM+= FreeBSD-*-i386   # Not available yet
+BROKEN_EXCEPT_ON_PLATFORM+= FreeBSD-*-i386
 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/ghc80/bootstrap.mk
diff -u pkgsrc/lang/ghc80/bootstrap.mk:1.1 pkgsrc/lang/ghc80/bootstrap.mk:1.2
--- pkgsrc/lang/ghc80/bootstrap.mk:1.1  Fri Jan  3 15:24:08 2020
+++ pkgsrc/lang/ghc80/bootstrap.mk      Mon Jan 13 11:49:36 2020
@@ -1,4 +1,4 @@
-# $NetBSD: bootstrap.mk,v 1.1 2020/01/03 15:24:08 pho Exp $
+# $NetBSD: bootstrap.mk,v 1.2 2020/01/13 11:49:36 pho Exp $
 # -----------------------------------------------------------------------------
 # Select a bindist of bootstrapping compiler on a per-platform basis.
 #
@@ -25,9 +25,9 @@
 .endif
 
 .if !empty(MACHINE_PLATFORM:MFreeBSD-*-i386) || make(distinfo) || make (makesum) || make(mdi)
-#BOOT_VERSION:=        7.10.3
-#BOOT_ARCHIVE:=        ghc-${BOOT_VERSION}-boot-i386-unknown-freebsd.tar.xz
-#DISTFILES:=   ${DISTFILES} ${BOOT_ARCHIVE} # Available in LOCAL_PORTS
+BOOT_VERSION:= 8.0.2
+BOOT_ARCHIVE:= ghc-${BOOT_VERSION}-boot-i386-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)
@@ -67,16 +67,6 @@ SITES.${i}?= ${MASTER_SITE_LOCAL}
 CONFLICTS+=    libelf-[0-9]*
 .endif
 
-# FreeBSD < 10 surprisingly doesn't have a native iconv so we need to
-# use pkgsrc libiconv for this OPSYS. And if a bootkit depends on
-# pkgsrc libiconv, the "normal" build must do the same because GHC
-# always needs to link executables with libiconv, just like libgmp
-# when integer-gmp is used. For this reason it might be desirable to
-# create two separate bootkits, one for < 10 and another for >= 10.
-.if ${OPSYS} == "FreeBSD"
-USE_BUILTIN.iconv=     no
-.endif
-
 # current bootstrap binary kit for SmartOS is built with ncurses5
 .if !empty(MACHINE_PLATFORM:MSunOS-*) && !empty(OS_VARIANT:U:MSmartOS)
 BUILD_DEPENDS+=        ncurses>=5.0:../../devel/ncurses
Index: pkgsrc/lang/ghc80/buildlink3.mk
diff -u pkgsrc/lang/ghc80/buildlink3.mk:1.1 pkgsrc/lang/ghc80/buildlink3.mk:1.2
--- pkgsrc/lang/ghc80/buildlink3.mk:1.1 Fri Jan  3 15:24:08 2020
+++ pkgsrc/lang/ghc80/buildlink3.mk     Mon Jan 13 11:49:36 2020
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2020/01/03 15:24:08 pho Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2020/01/13 11:49:36 pho Exp $
 
 BUILDLINK_TREE+=       ghc
 
@@ -9,12 +9,6 @@ BUILDLINK_API_DEPENDS.ghc+=    ghc>=8.0.2
 BUILDLINK_ABI_DEPENDS.ghc+=    ghc>=8.0.2
 BUILDLINK_PKGSRCDIR.ghc?=      ../../lang/ghc80
 
-# On FreeBSD we need pkgsrc libiconv. See bootstrap.mk for details.
-.include "../../mk/bsd.fast.prefs.mk"
-.if ${OPSYS} == "FreeBSD"
-USE_BUILTIN.iconv=     no
-.endif
-
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/libffi/buildlink3.mk"
 .include "../../devel/gmp/buildlink3.mk"
Index: pkgsrc/lang/ghc80/distinfo
diff -u pkgsrc/lang/ghc80/distinfo:1.1 pkgsrc/lang/ghc80/distinfo:1.2
--- pkgsrc/lang/ghc80/distinfo:1.1      Fri Jan  3 15:24:08 2020
+++ pkgsrc/lang/ghc80/distinfo  Mon Jan 13 11:49:36 2020
@@ -1,5 +1,9 @@
-$NetBSD: distinfo,v 1.1 2020/01/03 15:24:08 pho Exp $
+$NetBSD: distinfo,v 1.2 2020/01/13 11:49:36 pho Exp $
 
+SHA1 (ghc-8.0.2-boot-i386-unknown-freebsd.tar.xz) = 0d6ffbb87f76aa4bfa243ba590978b993b359bd0
+RMD160 (ghc-8.0.2-boot-i386-unknown-freebsd.tar.xz) = cdcea446b5ae76ca90cac6fb3ae85c13fed04094
+SHA512 (ghc-8.0.2-boot-i386-unknown-freebsd.tar.xz) = 078290c325c8e5b8d861816750d58b4289ad51ac4f39b803b670d7ece5fb46e9fd39c1859ec54770ad9cfc7e423790d0f5a0c58e5881f96b4078763a6b48c0a0
+Size (ghc-8.0.2-boot-i386-unknown-freebsd.tar.xz) = 48217412 bytes
 SHA1 (ghc-8.0.2-boot-x86_64-unknown-netbsd.tar.xz) = 739ff0e666e5b3bb6e31d5c9b95ad01ab1225105
 RMD160 (ghc-8.0.2-boot-x86_64-unknown-netbsd.tar.xz) = 29f162e0547c686274eb8389c30e8a76b53a51eb
 SHA512 (ghc-8.0.2-boot-x86_64-unknown-netbsd.tar.xz) = 829ac54c9cf5031d93e994424a70093da38a612281ad2e8422a0dbd1e5beb34deecca042ae82706c97c3e4b9ab745140c796e3a6a16903cb04adfac52b8d83da
@@ -13,9 +17,9 @@ SHA1 (patch-libraries_base_GHC_Event_KQu
 SHA1 (patch-libraries_base_System_Environment.hs) = ec3dfd916593f600a397e5b594672e6d3564f042
 SHA1 (patch-libraries_time_lib_Data_Time_Clock_CTimespec.hsc) = 758502590ac746990ffcc7fd08dda441ca003532
 SHA1 (patch-libraries_time_lib_Data_Time_Clock_CTimeval.hs) = 8961cbf704b29c5e06ec6a95b9a9c9d0db69760a
-SHA1 (patch-libraries_unix_System_Posix_Env.hsc) = e94936c139ca15d45cac4a7feb74a601567913ab
+SHA1 (patch-libraries_unix_include_execvpe.h) = 67dd9720a71a6a55bbe2b50e61621ca60187ef00
 SHA1 (patch-libraries_unix_System_Posix_Env_ByteString.hsc) = 3f675fc5d6bf5cc59a2d5ccffeb9ccd51521645a
+SHA1 (patch-libraries_unix_System_Posix_Env.hsc) = e94936c139ca15d45cac4a7feb74a601567913ab
 SHA1 (patch-libraries_unix_System_Posix_Files_Common.hsc) = 6efef280832d376915a8987e4e8aac283408f607
 SHA1 (patch-libraries_unix_System_Posix_Signals.hsc) = 49215dce493a6bbc440f91a3959e592f86fc779b
-SHA1 (patch-libraries_unix_include_execvpe.h) = 67dd9720a71a6a55bbe2b50e61621ca60187ef00
 SHA1 (patch-rts_PosixSource.h) = 604608791f33245d9305dcbd6d9d5979fe162f21