diff options
| author | pho <pho@pkgsrc.org> | 2021-05-01 03:00:06 +0000 |
|---|---|---|
| committer | pho <pho@pkgsrc.org> | 2021-05-01 03:00:06 +0000 |
| commit | c81e1e22303dd1ed874ef3fe0f813b45c211133c (patch) | |
| tree | 4f8a4f24ca05531c263b7f2ffdde51b3d925941b /lang/ghc88 | |
| parent | 0746dad77f5447c6dbc9c20aaab936d939354a37 (diff) | |
| download | pkgsrc-c81e1e22303dd1ed874ef3fe0f813b45c211133c.tar.gz | |
Fix a bug in the previous commit which would produce a non-installable bootkit
Diffstat (limited to 'lang/ghc88')
| -rw-r--r-- | lang/ghc88/distinfo | 4 | ||||
| -rw-r--r-- | lang/ghc88/patches/patch-ghc.mk | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lang/ghc88/distinfo b/lang/ghc88/distinfo index 331c75055c0..77457f78e7b 100644 --- a/lang/ghc88/distinfo +++ b/lang/ghc88/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.17 2021/04/29 05:09:08 pho Exp $ +$NetBSD: distinfo,v 1.18 2021/05/01 03:00:06 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 @@ -31,7 +31,7 @@ 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-ghc.mk) = 9bfa82ee29c2786e7bae800279823bee72e4fab1 +SHA1 (patch-ghc.mk) = 1a4de0f175b0b73dc6d09a26b8c55bb6e0be0e18 SHA1 (patch-ghc_ghc.mk) = 9c639cc95cb79e4ffbd9b5fce311edba54939b5e SHA1 (patch-libraries_Cabal_Cabal_Distribution_Simple_GHC.hs) = a4c82b1282c0580a7945be8c3b9d38bc760db99f SHA1 (patch-libraries_base_GHC_Event_KQueue.hsc) = 8ee5da667a241a05fde3c580d3dc9bdc05aa5f00 diff --git a/lang/ghc88/patches/patch-ghc.mk b/lang/ghc88/patches/patch-ghc.mk index 6be0d33bc4b..5423a0b89ec 100644 --- a/lang/ghc88/patches/patch-ghc.mk +++ b/lang/ghc88/patches/patch-ghc.mk @@ -1,4 +1,4 @@ -$NetBSD: patch-ghc.mk,v 1.1 2021/04/28 15:39:23 pho Exp $ +$NetBSD: patch-ghc.mk,v 1.2 2021/05/01 03:00:07 pho Exp $ Use the wrapper scripts for ghc as we can't use the ones from the DESTDIR as the libraries are not in the right place yet. @@ -10,7 +10,7 @@ as the libraries are not in the right place yet. INSTALLED_PACKAGE_CONF=$(DESTDIR)$(topdir)/package.conf.d -ifeq "$(BINDIST) $(CrossCompiling)" "NO YES" -+ifeq "UseWrappers" "UseWrappers" ++ifeq "$(BINDIST)" "NO" # when installing ghc-stage2 we can't run target's # 'ghc-pkg' and 'ghc-stage2' but those are needed for registration. INSTALLED_GHC_REAL=$(TOP)/inplace/bin/ghc-stage1 |