CVS commit: pkgsrc/lang/ghc88

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Feb 16 21:13:52 UTC 2021

Modified Files:
        pkgsrc/lang/ghc88: Makefile bootstrap.mk distinfo

Log Message:
ghc88: backport fix for NetBSD-current from ghc810


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 pkgsrc/lang/ghc88/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/lang/ghc88/bootstrap.mk
cvs rdiff -u -r1.14 -r1.15 pkgsrc/lang/ghc88/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/ghc88/Makefile
diff -u pkgsrc/lang/ghc88/Makefile:1.15 pkgsrc/lang/ghc88/Makefile:1.16
--- pkgsrc/lang/ghc88/Makefile:1.15     Mon Aug 31 18:09:50 2020
+++ pkgsrc/lang/ghc88/Makefile  Tue Feb 16 21:13:52 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2020/08/31 18:09:50 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2021/02/16 21:13:52 wiz Exp $
 # -----------------------------------------------------------------------------
 # Package metadata
 #
@@ -240,7 +240,7 @@ BUILD_DEPENDS+=     compat80-[0-9]*:../../em
 # In a sandboxed build environment, we have to reach over to the
 # installed libraries themselves, since the symlinks compat80 adds
 # to the /usr tree can't be applied.
-ALL_ENV+=      LD_LIBRARY_PATH=${PREFIX}/emul/netbsd/usr/lib:${FILESDIR}
+ALL_ENV+=      LD_LIBRARY_PATH=${PREFIX}/emul/netbsd/usr/lib:${WRKDIR}/lib:${FILESDIR}
 .endif
 
 .include "../../converters/libiconv/buildlink3.mk"

Index: pkgsrc/lang/ghc88/bootstrap.mk
diff -u pkgsrc/lang/ghc88/bootstrap.mk:1.6 pkgsrc/lang/ghc88/bootstrap.mk:1.7
--- pkgsrc/lang/ghc88/bootstrap.mk:1.6  Tue Mar 24 20:40:15 2020
+++ pkgsrc/lang/ghc88/bootstrap.mk      Tue Feb 16 21:13:52 2021
@@ -1,4 +1,4 @@
-# $NetBSD: bootstrap.mk,v 1.6 2020/03/24 20:40:15 joerg Exp $
+# $NetBSD: bootstrap.mk,v 1.7 2021/02/16 21:13:52 wiz Exp $
 # -----------------------------------------------------------------------------
 # Select a bindist of bootstrapping compiler on a per-platform basis.
 #
@@ -54,6 +54,10 @@ DISTFILES:=  ${DISTFILES} ${BOOT_ARCHIVE}
 BOOT_VERSION:= 8.4.4
 BOOT_ARCHIVE:= ghc-${BOOT_VERSION}-boot-x86_64-unknown-netbsd.tar.xz
 DISTFILES:=    ${DISTFILES} ${BOOT_ARCHIVE} # Available in LOCAL_PORTS
+.  if !empty(MACHINE_PLATFORM:MNetBSD-9.99*-x86_64) || make(distinfo) || make (makesum) || make(mdi)
+DISTFILES+=    netbsd-9.0-amd64-libterminfo.tar.gz
+EXTRACT_ONLY+= netbsd-9.0-amd64-libterminfo.tar.gz
+.  endif
 .endif
 
 .if !empty(MACHINE_PLATFORM:MSunOS-*-i386) || make(distinfo) || make (makesum) || make(mdi)

Index: pkgsrc/lang/ghc88/distinfo
diff -u pkgsrc/lang/ghc88/distinfo:1.14 pkgsrc/lang/ghc88/distinfo:1.15
--- pkgsrc/lang/ghc88/distinfo:1.14     Tue Feb  9 12:42:08 2021
+++ pkgsrc/lang/ghc88/distinfo  Tue Feb 16 21:13:52 2021
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.14 2021/02/09 12:42:08 ryoon Exp $
+$NetBSD: distinfo,v 1.15 2021/02/16 21:13:52 wiz 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
@@ -24,6 +24,10 @@ SHA1 (ghc-8.8.4-src.tar.xz) = 94dfb44d8f
 RMD160 (ghc-8.8.4-src.tar.xz) = 2201ffb27231d9fce293b77830e6fae09f48f163
 SHA512 (ghc-8.8.4-src.tar.xz) = efd23bd819f7429486696a3a929a040471db7ea8a2d1f1d832e4cf0825b9e1e0c5e6ecad0ab8376f58b74e9c28c1d2f773bd126596d6d853c9e57d57e5ceb090
 Size (ghc-8.8.4-src.tar.xz) = 19395252 bytes
+SHA1 (netbsd-9.0-amd64-libterminfo.tar.gz) = db6b385b8676efc135c08b06e3dd6fd11b926999
+RMD160 (netbsd-9.0-amd64-libterminfo.tar.gz) = 5a246633c90ee85f71efcc02d8280bd0c50ab5a7
+SHA512 (netbsd-9.0-amd64-libterminfo.tar.gz) = 79288d44b84df8848afc2cdfee628cc4fd1ec0334159403ef8ba994d617bc56a7114af3031198afb5f3b8f45c0463a848099431e32bc6725042908576b6f95b8
+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