diff options
author | wiz <wiz@pkgsrc.org> | 2021-02-17 07:02:30 +0000 |
---|---|---|
committer | wiz <wiz@pkgsrc.org> | 2021-02-17 07:02:30 +0000 |
commit | f70bfcfeabd53e68b57207e57f273eeca56b898a (patch) | |
tree | a8761d1a1a33e7ab4349ecfa3339e3e5fa322151 | |
parent | 905e80718c87eb17e50d22277a5de8947b78ea4c (diff) | |
download | pkgsrc-f70bfcfeabd53e68b57207e57f273eeca56b898a.tar.gz |
ghc84: merge NetBSD-current support from ghc810
-rw-r--r-- | lang/ghc84/Makefile | 4 | ||||
-rw-r--r-- | lang/ghc84/bootstrap.mk | 6 | ||||
-rw-r--r-- | lang/ghc84/distinfo | 6 |
3 files changed, 12 insertions, 4 deletions
diff --git a/lang/ghc84/Makefile b/lang/ghc84/Makefile index e664f0041fc..5e6ead4a622 100644 --- a/lang/ghc84/Makefile +++ b/lang/ghc84/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2020/08/31 18:09:50 wiz Exp $ +# $NetBSD: Makefile,v 1.11 2021/02/17 07:02:30 wiz Exp $ # ----------------------------------------------------------------------------- # Package metadata # @@ -211,7 +211,7 @@ BUILD_DEPENDS+= compat80-[0-9]*:../../emulators/compat80 # 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:Q}/emul/netbsd/usr/lib:${FILESDIR} +ALL_ENV+= LD_LIBRARY_PATH=${PREFIX}/emul/netbsd/usr/lib:${WRKDIR}/lib:${FILESDIR} .endif .include "../../converters/libiconv/buildlink3.mk" diff --git a/lang/ghc84/bootstrap.mk b/lang/ghc84/bootstrap.mk index 479252c06dc..80ba4f602c4 100644 --- a/lang/ghc84/bootstrap.mk +++ b/lang/ghc84/bootstrap.mk @@ -1,4 +1,4 @@ -# $NetBSD: bootstrap.mk,v 1.6 2020/03/27 04:13:57 riastradh Exp $ +# $NetBSD: bootstrap.mk,v 1.7 2021/02/17 07:02:30 wiz Exp $ # ----------------------------------------------------------------------------- # Select a bindist of bootstrapping compiler on a per-platform basis. # @@ -46,6 +46,10 @@ DISTFILES:= ${DISTFILES} ${BOOT_ARCHIVE} # Available in LOCAL_PORTS 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) diff --git a/lang/ghc84/distinfo b/lang/ghc84/distinfo index 8e96fcb9a79..f607c5f1faa 100644 --- a/lang/ghc84/distinfo +++ b/lang/ghc84/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.6 2021/02/09 12:41:32 ryoon Exp $ +$NetBSD: distinfo,v 1.7 2021/02/17 07:02:30 wiz Exp $ SHA1 (ghc-8.0.2-boot-x86_64-unknown-solaris2.tar.xz) = 517ea9435af0c8b4f32899ae3bd26ff8da34f180 RMD160 (ghc-8.0.2-boot-x86_64-unknown-solaris2.tar.xz) = c88b0958085ce9a6e1b175280d536986e4c712b1 @@ -24,6 +24,10 @@ SHA1 (ghc-8.4.4-src.tar.xz) = bf8f807348c8a64469e42ecf9c4b71108f185c2c RMD160 (ghc-8.4.4-src.tar.xz) = d2be33c4b38ee0660fe081e625ad5242c819392c SHA512 (ghc-8.4.4-src.tar.xz) = 685e102eee8cf8b6a377afd7871998c8c368a5da288469367e3fb804aa6109e6f59be5945b8cd3d1e36c851190ea9a7f74c576528589589313d237b721d86da5 Size (ghc-8.4.4-src.tar.xz) = 11319500 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) = cb444acc956f46657070f9f6dc343008b35594bd SHA1 (patch-configure.ac) = dae98e76c51fdc2f70a77adf7d206c3d79c6bca6 SHA1 (patch-libraries_base_GHC_Event_KQueue.hsc) = 8ee5da667a241a05fde3c580d3dc9bdc05aa5f00 |