Wed Apr 28 15:39:24 2021 UTC ()
Apply jperkin@'s patch to remove $ORIGIN use

On Darwin it still uses @loader_path though. I'm going to handle it later.


(pho)
diff -r1.17 -r1.18 pkgsrc/lang/ghc88/Makefile
diff -r1.7 -r1.8 pkgsrc/lang/ghc88/bootstrap.mk
diff -r1.15 -r1.16 pkgsrc/lang/ghc88/distinfo
diff -r0 -r1.1 pkgsrc/lang/ghc88/patches/patch-ghc.mk
diff -r0 -r1.3 pkgsrc/lang/ghc88/patches/patch-rules_distdir-way-opts.mk
cvs diff -r1.17 -r1.18 pkgsrc/lang/ghc88/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/ghc88/Makefile 2021/04/27 13:55:25 1.17
+++ pkgsrc/lang/ghc88/Makefile 2021/04/28 15:39:23 1.18
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1# $NetBSD: Makefile,v 1.17 2021/04/27 13:55:25 pho Exp $ 1# $NetBSD: Makefile,v 1.18 2021/04/28 15:39:23 pho Exp $
2# ----------------------------------------------------------------------------- 2# -----------------------------------------------------------------------------
3# Package metadata 3# Package metadata
4# 4#
5DISTNAME= ghc-8.8.4-src 5DISTNAME= ghc-8.8.4-src
6PKGNAME= ${DISTNAME:S/-src$//} 6PKGNAME= ${DISTNAME:S/-src$//}
7PKGREVISION= 2 7PKGREVISION= 3
8CATEGORIES= lang 8CATEGORIES= lang
9MASTER_SITES= https://downloads.haskell.org/~ghc/${PKGVERSION_NOREV}/ 9MASTER_SITES= https://downloads.haskell.org/~ghc/${PKGVERSION_NOREV}/
10EXTRACT_SUFX= .tar.xz 10EXTRACT_SUFX= .tar.xz
11 11
12MAINTAINER= pho@cielonegro.org 12MAINTAINER= pho@cielonegro.org
13HOMEPAGE= https://www.haskell.org/ghc/ 13HOMEPAGE= https://www.haskell.org/ghc/
14COMMENT= Compiler for the functional language Haskell - 8.8 Release Series 14COMMENT= Compiler for the functional language Haskell - 8.8 Release Series
15LICENSE= modified-bsd 15LICENSE= modified-bsd
16 16
17UNLIMIT_RESOURCES= datasize virtualsize 17UNLIMIT_RESOURCES= datasize virtualsize
18 18
19# TODO: We should be using the alternatives framework. 19# TODO: We should be using the alternatives framework.
20CONFLICTS+= ghc-[0-9]* 20CONFLICTS+= ghc-[0-9]*
@@ -192,62 +192,48 @@ post-install: @@ -192,62 +192,48 @@ post-install:
192# [2019-12-27; pho]. 192# [2019-12-27; pho].
193GENERATE_PLIST+= \ 193GENERATE_PLIST+= \
194 cd ${DESTDIR}${PREFIX} && \ 194 cd ${DESTDIR}${PREFIX} && \
195 ${FIND} * \( -type f -o -type l \) | ${SORT}; 195 ${FIND} * \( -type f -o -type l \) | ${SORT};
196 196
197 197
198# ----------------------------------------------------------------------------- 198# -----------------------------------------------------------------------------
199# Sanity checks 199# Sanity checks
200# 200#
201 201
202# There is an unused script which don't pass the portability test. 202# There is an unused script which don't pass the portability test.
203CHECK_PORTABILITY_SKIP+= distrib/prep-bin-dist-mingw 203CHECK_PORTABILITY_SKIP+= distrib/prep-bin-dist-mingw
204 204
205# Dynamically linked Haskell executables and libraries have rpaths to 
206# dependent Haskell libraries, but the problem is that they are 
207# specified with $ORIGIN, which isn't currently supported by 
208# ../../mk/check/check-shlibs-elf.awk nor 
209# mk/pkgformat/pkg/metadata.mk. 
210# 
211# This means we need to disable the entire CHECK_SHLIBS machinery 
212# because otherwise the resulting binary package would contain 
213# REQUIRES lines with $ORIGIN wrongly expanded by ldd(1). 
214# 
215# Note that arguments like "-Wl,-rpath,$ORIGIN/.." are usually dropped 
216# by the "cleanup" phase of wrappers. This is not the case in GHC 
217# because GHC uses @file syntax while linking objects, and our 
218# wrappers does nothing about it. 
219CHECK_SHLIBS_SUPPORTED= no 
220 
221# ghc57207_0.s: failed to add inputs for merge: Resource temporarily unavailable 205# ghc57207_0.s: failed to add inputs for merge: Resource temporarily unavailable
222CTF_FILES_SKIP+= */libHS*-ghc${PKGVERSION_NOREV}.* 206CTF_FILES_SKIP+= */libHS*-ghc${PKGVERSION_NOREV}.*
223 207
224# ld: fatal: relocation error ... relocation requires reference symbol 208# ld: fatal: relocation error ... relocation requires reference symbol
225STRIP_FILES_SKIP+= lib/${PKGNAME_NOREV}/libHSrts.a 209STRIP_FILES_SKIP+= lib/${PKGNAME_NOREV}/libHSrts.a
226 210
227 211
228# ----------------------------------------------------------------------------- 212# -----------------------------------------------------------------------------
229# Dependencies 213# Dependencies
230# 214#
231.if ${BUILD_SPHINX_HTML} != "no" 215.if ${BUILD_SPHINX_HTML} != "no"
232BUILDLINK_DEPMETHOD.python:= build 216BUILDLINK_DEPMETHOD.python:= build
233.include "../../lang/python/pyversion.mk" 217.include "../../lang/python/pyversion.mk"
234BUILD_DEPENDS+= ${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx 218BUILD_DEPENDS+= ${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx
235.endif 219.endif
236 220
237# NetBSD 9.x have libcurses with a newer major version than the 221# NetBSD 9.x have libcurses with a newer major version than the
238# bootstrap kit is linked against. For now, work around this with 222# bootstrap kit is linked against. For now, work around this with
239# compat80. 223# compat80.
240.if ${OPSYS} == "NetBSD" && empty(OS_VERSION:M[0-8].*) 224.if ${OPSYS} == "NetBSD" && empty(OS_VERSION:M[0-8].*)
241BUILD_DEPENDS+= compat80-[0-9]*:../../emulators/compat80 225BUILD_DEPENDS+= compat80-[0-9]*:../../emulators/compat80
242# In a sandboxed build environment, we have to reach over to the 226# In a sandboxed build environment, we have to reach over to the
243# installed libraries themselves, since the symlinks compat80 adds 227# installed libraries themselves, since the symlinks compat80 adds
244# to the /usr tree can't be applied. 228# to the /usr tree can't be applied.
245ALL_ENV+= LD_LIBRARY_PATH=${PREFIX}/emul/netbsd/usr/lib:${WRKDIR}/lib:${FILESDIR} 229ALL_ENV+= LD_LIBRARY_PATH=${PREFIX}/emul/netbsd/usr/lib:${WRKDIR}/lib
 230# XXX: ${WRKDIR}/lib is a temporary workaround for compat80 not having
 231# libterminfo.so.1. See ./bootstrap.mk
246.endif 232.endif
247 233
248.include "../../converters/libiconv/buildlink3.mk" 234.include "../../converters/libiconv/buildlink3.mk"
249.include "../../devel/libffi/buildlink3.mk" 235.include "../../devel/libffi/buildlink3.mk"
250.include "../../devel/gmp/buildlink3.mk" 236.include "../../devel/gmp/buildlink3.mk"
251.include "../../mk/curses.buildlink3.mk" 237.include "../../mk/curses.buildlink3.mk"
252.include "../../mk/pthread.buildlink3.mk" 238.include "../../mk/pthread.buildlink3.mk"
253.include "../../mk/bsd.pkg.mk" 239.include "../../mk/bsd.pkg.mk"
cvs diff -r1.7 -r1.8 pkgsrc/lang/ghc88/bootstrap.mk (expand / switch to unified diff)

--- pkgsrc/lang/ghc88/bootstrap.mk 2021/02/16 21:13:52 1.7
+++ pkgsrc/lang/ghc88/bootstrap.mk 2021/04/28 15:39:23 1.8
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: bootstrap.mk,v 1.7 2021/02/16 21:13:52 wiz Exp $ 1# $NetBSD: bootstrap.mk,v 1.8 2021/04/28 15:39:23 pho Exp $
2# ----------------------------------------------------------------------------- 2# -----------------------------------------------------------------------------
3# Select a bindist of bootstrapping compiler on a per-platform basis. 3# Select a bindist of bootstrapping compiler on a per-platform basis.
4# 4#
5# BOOT_ARCHIVE 5# BOOT_ARCHIVE
6# This variable is set to the name of compressed archive file of a 6# This variable is set to the name of compressed archive file of a
7# bootstrapping compiler for the current platform. 7# bootstrapping compiler for the current platform.
8# 8#
9# BOOT_VERSION 9# BOOT_VERSION
10# Version of the bootstrapping compiler to use. This can be 10# Version of the bootstrapping compiler to use. This can be
11# overriden for specific platforms. 11# overriden for specific platforms.
12# 12#
13.include "../../mk/bsd.prefs.mk" 13.include "../../mk/bsd.prefs.mk"
14 14
@@ -44,29 +44,32 @@ BOOT_ARCHIVE:= ghc-${BOOT_VERSION}-boot- @@ -44,29 +44,32 @@ BOOT_ARCHIVE:= ghc-${BOOT_VERSION}-boot-
44DISTFILES:= ${DISTFILES} ${BOOT_ARCHIVE} # Available in LOCAL_PORTS 44DISTFILES:= ${DISTFILES} ${BOOT_ARCHIVE} # Available in LOCAL_PORTS
45.endif 45.endif
46 46
47.if !empty(MACHINE_PLATFORM:MFreeBSD-*-x86_64) || make(distinfo) || make(makesum) || make(mdi) 47.if !empty(MACHINE_PLATFORM:MFreeBSD-*-x86_64) || make(distinfo) || make(makesum) || make(mdi)
48BOOT_VERSION:= 8.4.4 48BOOT_VERSION:= 8.4.4
49BOOT_ARCHIVE:= ghc-${BOOT_VERSION}-boot-x86_64-unknown-freebsd.tar.xz 49BOOT_ARCHIVE:= ghc-${BOOT_VERSION}-boot-x86_64-unknown-freebsd.tar.xz
50DISTFILES:= ${DISTFILES} ${BOOT_ARCHIVE} # Available in LOCAL_PORTS 50DISTFILES:= ${DISTFILES} ${BOOT_ARCHIVE} # Available in LOCAL_PORTS
51.endif 51.endif
52 52
53.if !empty(MACHINE_PLATFORM:MNetBSD-*-x86_64) || make(distinfo) || make (makesum) || make(mdi) 53.if !empty(MACHINE_PLATFORM:MNetBSD-*-x86_64) || make(distinfo) || make (makesum) || make(mdi)
54BOOT_VERSION:= 8.4.4 54BOOT_VERSION:= 8.4.4
55BOOT_ARCHIVE:= ghc-${BOOT_VERSION}-boot-x86_64-unknown-netbsd.tar.xz 55BOOT_ARCHIVE:= ghc-${BOOT_VERSION}-boot-x86_64-unknown-netbsd.tar.xz
56DISTFILES:= ${DISTFILES} ${BOOT_ARCHIVE} # Available in LOCAL_PORTS 56DISTFILES:= ${DISTFILES} ${BOOT_ARCHIVE} # Available in LOCAL_PORTS
57. if !empty(MACHINE_PLATFORM:MNetBSD-9.99*-x86_64) || make(distinfo) || make (makesum) || make(mdi) 57. if !empty(MACHINE_PLATFORM:MNetBSD-9.99.*-x86_64) || make(distinfo) || make (makesum) || make(mdi)
 58# XXX: emulators/compat80 appears to lack libterminfo.so.1 used by
 59# this bootkit.
58DISTFILES+= netbsd-9.0-amd64-libterminfo.tar.gz 60DISTFILES+= netbsd-9.0-amd64-libterminfo.tar.gz
59EXTRACT_ONLY+= netbsd-9.0-amd64-libterminfo.tar.gz 61EXTRACT_ONLY+= netbsd-9.0-amd64-libterminfo.tar.gz
 62SITES.netbsd-9.0-amd64-libterminfo.tar.gz?= ${MASTER_SITE_LOCAL}
60. endif 63. endif
61.endif 64.endif
62 65
63.if !empty(MACHINE_PLATFORM:MSunOS-*-i386) || make(distinfo) || make (makesum) || make(mdi) 66.if !empty(MACHINE_PLATFORM:MSunOS-*-i386) || make(distinfo) || make (makesum) || make(mdi)
64#BOOT_VERSION:= 8.4.4 67#BOOT_VERSION:= 8.4.4
65#BOOT_ARCHIVE:= ghc-${BOOT_VERSION}-boot-i386-unknown-solaris2.tar.xz 68#BOOT_ARCHIVE:= ghc-${BOOT_VERSION}-boot-i386-unknown-solaris2.tar.xz
66#DISTFILES:= ${DISTFILES} ${BOOT_ARCHIVE} # Available in LOCAL_PORTS 69#DISTFILES:= ${DISTFILES} ${BOOT_ARCHIVE} # Available in LOCAL_PORTS
67.endif 70.endif
68 71
69.if !empty(MACHINE_PLATFORM:MSunOS-*-x86_64) || make(distinfo) || make (makesum) || make(mdi) 72.if !empty(MACHINE_PLATFORM:MSunOS-*-x86_64) || make(distinfo) || make (makesum) || make(mdi)
70BOOT_VERSION:= 8.4.4 73BOOT_VERSION:= 8.4.4
71BOOT_ARCHIVE:= ghc-${BOOT_VERSION}-boot-x86_64-unknown-solaris2.tar.xz 74BOOT_ARCHIVE:= ghc-${BOOT_VERSION}-boot-x86_64-unknown-solaris2.tar.xz
72SITES.${BOOT_ARCHIVE}= https://us-east.manta.joyent.com/pkgsrc/public/pkg-bootstraps/ 75SITES.${BOOT_ARCHIVE}= https://us-east.manta.joyent.com/pkgsrc/public/pkg-bootstraps/
cvs diff -r1.15 -r1.16 pkgsrc/lang/ghc88/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/ghc88/distinfo 2021/02/16 21:13:52 1.15
+++ pkgsrc/lang/ghc88/distinfo 2021/04/28 15:39:23 1.16
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.15 2021/02/16 21:13:52 wiz Exp $ 1$NetBSD: distinfo,v 1.16 2021/04/28 15:39:23 pho Exp $
2 2
3SHA1 (ghc-8.4.4-boot-i386-unknown-freebsd.tar.xz) = 04981802730423aa12999e59679be198d540222a 3SHA1 (ghc-8.4.4-boot-i386-unknown-freebsd.tar.xz) = 04981802730423aa12999e59679be198d540222a
4RMD160 (ghc-8.4.4-boot-i386-unknown-freebsd.tar.xz) = f617e67f2c2f07c7211cb391a4bc2e7b304045e2 4RMD160 (ghc-8.4.4-boot-i386-unknown-freebsd.tar.xz) = f617e67f2c2f07c7211cb391a4bc2e7b304045e2
5SHA512 (ghc-8.4.4-boot-i386-unknown-freebsd.tar.xz) = 0819d9d9cd73688c143812c703e8394c9010e9e81c03a69c81f6bcc784f262ec04bffb9d8f2d030209f2f1a05ccddfb46c36fe789936e2b850920bf08052448f 5SHA512 (ghc-8.4.4-boot-i386-unknown-freebsd.tar.xz) = 0819d9d9cd73688c143812c703e8394c9010e9e81c03a69c81f6bcc784f262ec04bffb9d8f2d030209f2f1a05ccddfb46c36fe789936e2b850920bf08052448f
6Size (ghc-8.4.4-boot-i386-unknown-freebsd.tar.xz) = 52125656 bytes 6Size (ghc-8.4.4-boot-i386-unknown-freebsd.tar.xz) = 52125656 bytes
7SHA1 (ghc-8.4.4-boot-x86_64-apple-darwin.tar.xz) = 688f5729992bd2476699d9067d97e79b06bdec60 7SHA1 (ghc-8.4.4-boot-x86_64-apple-darwin.tar.xz) = 688f5729992bd2476699d9067d97e79b06bdec60
8RMD160 (ghc-8.4.4-boot-x86_64-apple-darwin.tar.xz) = 4e9c52c8ef07343cc24528e3f8431754237d0be3 8RMD160 (ghc-8.4.4-boot-x86_64-apple-darwin.tar.xz) = 4e9c52c8ef07343cc24528e3f8431754237d0be3
9SHA512 (ghc-8.4.4-boot-x86_64-apple-darwin.tar.xz) = abc92ca6822ba7fe2d09bc381a833c0cbd5f436b517fba003736195cec45f8ce2e33623a587ad35f5702baac791594d62fc829e2ea4dfceae2455875661b3ba6 9SHA512 (ghc-8.4.4-boot-x86_64-apple-darwin.tar.xz) = abc92ca6822ba7fe2d09bc381a833c0cbd5f436b517fba003736195cec45f8ce2e33623a587ad35f5702baac791594d62fc829e2ea4dfceae2455875661b3ba6
10Size (ghc-8.4.4-boot-x86_64-apple-darwin.tar.xz) = 51700444 bytes 10Size (ghc-8.4.4-boot-x86_64-apple-darwin.tar.xz) = 51700444 bytes
11SHA1 (ghc-8.4.4-boot-x86_64-unknown-freebsd.tar.xz) = e16fcc19bc76eed3de81dd14064fd427d4f04c93 11SHA1 (ghc-8.4.4-boot-x86_64-unknown-freebsd.tar.xz) = e16fcc19bc76eed3de81dd14064fd427d4f04c93
12RMD160 (ghc-8.4.4-boot-x86_64-unknown-freebsd.tar.xz) = 5e6eb0ca293c96dd7fa33e3ab8dc3541e2e2f441 12RMD160 (ghc-8.4.4-boot-x86_64-unknown-freebsd.tar.xz) = 5e6eb0ca293c96dd7fa33e3ab8dc3541e2e2f441
13SHA512 (ghc-8.4.4-boot-x86_64-unknown-freebsd.tar.xz) = 2eccb6c0a64d505363cb340e9a603c744c48c59202a00f4c535ba0b278908fe58c126d7bfc3ae233ec097febfa3c395c3622a4cb4270b85af5189f2ceeda664a 13SHA512 (ghc-8.4.4-boot-x86_64-unknown-freebsd.tar.xz) = 2eccb6c0a64d505363cb340e9a603c744c48c59202a00f4c535ba0b278908fe58c126d7bfc3ae233ec097febfa3c395c3622a4cb4270b85af5189f2ceeda664a
14Size (ghc-8.4.4-boot-x86_64-unknown-freebsd.tar.xz) = 53872384 bytes 14Size (ghc-8.4.4-boot-x86_64-unknown-freebsd.tar.xz) = 53872384 bytes
@@ -21,27 +21,29 @@ RMD160 (ghc-8.4.4-boot-x86_64-unknown-so @@ -21,27 +21,29 @@ RMD160 (ghc-8.4.4-boot-x86_64-unknown-so
21SHA512 (ghc-8.4.4-boot-x86_64-unknown-solaris2.tar.xz) = 88cba2a1954f0f2282e7b54b2c42f9b8d852b337996556301d9b739e4a89678c7a606e653ff21cce694489b9f02b8edd6641f62624dc0b6ecc53a377129785d5 21SHA512 (ghc-8.4.4-boot-x86_64-unknown-solaris2.tar.xz) = 88cba2a1954f0f2282e7b54b2c42f9b8d852b337996556301d9b739e4a89678c7a606e653ff21cce694489b9f02b8edd6641f62624dc0b6ecc53a377129785d5
22Size (ghc-8.4.4-boot-x86_64-unknown-solaris2.tar.xz) = 67421732 bytes 22Size (ghc-8.4.4-boot-x86_64-unknown-solaris2.tar.xz) = 67421732 bytes
23SHA1 (ghc-8.8.4-src.tar.xz) = 94dfb44d8f6b812a7023309ec909e2288f0e7724 23SHA1 (ghc-8.8.4-src.tar.xz) = 94dfb44d8f6b812a7023309ec909e2288f0e7724
24RMD160 (ghc-8.8.4-src.tar.xz) = 2201ffb27231d9fce293b77830e6fae09f48f163 24RMD160 (ghc-8.8.4-src.tar.xz) = 2201ffb27231d9fce293b77830e6fae09f48f163
25SHA512 (ghc-8.8.4-src.tar.xz) = efd23bd819f7429486696a3a929a040471db7ea8a2d1f1d832e4cf0825b9e1e0c5e6ecad0ab8376f58b74e9c28c1d2f773bd126596d6d853c9e57d57e5ceb090 25SHA512 (ghc-8.8.4-src.tar.xz) = efd23bd819f7429486696a3a929a040471db7ea8a2d1f1d832e4cf0825b9e1e0c5e6ecad0ab8376f58b74e9c28c1d2f773bd126596d6d853c9e57d57e5ceb090
26Size (ghc-8.8.4-src.tar.xz) = 19395252 bytes 26Size (ghc-8.8.4-src.tar.xz) = 19395252 bytes
27SHA1 (netbsd-9.0-amd64-libterminfo.tar.gz) = db6b385b8676efc135c08b06e3dd6fd11b926999 27SHA1 (netbsd-9.0-amd64-libterminfo.tar.gz) = db6b385b8676efc135c08b06e3dd6fd11b926999
28RMD160 (netbsd-9.0-amd64-libterminfo.tar.gz) = 5a246633c90ee85f71efcc02d8280bd0c50ab5a7 28RMD160 (netbsd-9.0-amd64-libterminfo.tar.gz) = 5a246633c90ee85f71efcc02d8280bd0c50ab5a7
29SHA512 (netbsd-9.0-amd64-libterminfo.tar.gz) = 79288d44b84df8848afc2cdfee628cc4fd1ec0334159403ef8ba994d617bc56a7114af3031198afb5f3b8f45c0463a848099431e32bc6725042908576b6f95b8 29SHA512 (netbsd-9.0-amd64-libterminfo.tar.gz) = 79288d44b84df8848afc2cdfee628cc4fd1ec0334159403ef8ba994d617bc56a7114af3031198afb5f3b8f45c0463a848099431e32bc6725042908576b6f95b8
30Size (netbsd-9.0-amd64-libterminfo.tar.gz) = 27744 bytes 30Size (netbsd-9.0-amd64-libterminfo.tar.gz) = 27744 bytes
31SHA1 (patch-aclocal.m4) = 16ac8899a7d87cf93a6139edba9e5222eb4c5c66 31SHA1 (patch-aclocal.m4) = 16ac8899a7d87cf93a6139edba9e5222eb4c5c66
32SHA1 (patch-compiler_main_DynFlags.hs) = 07bb2a5afdd087f4d2da5c035feecc13273aec70 32SHA1 (patch-compiler_main_DynFlags.hs) = 07bb2a5afdd087f4d2da5c035feecc13273aec70
33SHA1 (patch-configure.ac) = 6e5cec26e440ccd71343a1981b415459813f88be 33SHA1 (patch-configure.ac) = 6e5cec26e440ccd71343a1981b415459813f88be
 34SHA1 (patch-ghc.mk) = 9bfa82ee29c2786e7bae800279823bee72e4fab1
34SHA1 (patch-ghc_ghc.mk) = 9c639cc95cb79e4ffbd9b5fce311edba54939b5e 35SHA1 (patch-ghc_ghc.mk) = 9c639cc95cb79e4ffbd9b5fce311edba54939b5e
35SHA1 (patch-libraries_Cabal_Cabal_Distribution_Simple_GHC.hs) = a4c82b1282c0580a7945be8c3b9d38bc760db99f 36SHA1 (patch-libraries_Cabal_Cabal_Distribution_Simple_GHC.hs) = a4c82b1282c0580a7945be8c3b9d38bc760db99f
36SHA1 (patch-libraries_base_GHC_Event_KQueue.hsc) = 8ee5da667a241a05fde3c580d3dc9bdc05aa5f00 37SHA1 (patch-libraries_base_GHC_Event_KQueue.hsc) = 8ee5da667a241a05fde3c580d3dc9bdc05aa5f00
37SHA1 (patch-libraries_base_System_CPUTime_Posix_Times.hsc) = 2bfb779d534d12073287274ce5e90b99e457a860 38SHA1 (patch-libraries_base_System_CPUTime_Posix_Times.hsc) = 2bfb779d534d12073287274ce5e90b99e457a860
38SHA1 (patch-libraries_base_System_Environment.hs) = 7d79a91f295915b4408d5f41d5405739d7189215 39SHA1 (patch-libraries_base_System_Environment.hs) = 7d79a91f295915b4408d5f41d5405739d7189215
39SHA1 (patch-libraries_base_configure) = f06a961a6507f635aafe50dab3ff4396c012bdec 40SHA1 (patch-libraries_base_configure) = f06a961a6507f635aafe50dab3ff4396c012bdec
40SHA1 (patch-libraries_time_lib_Data_Time_Clock_Internal_CTimespec.hsc) = 588270767f8a9cbde0648fc99807891fef65d721 41SHA1 (patch-libraries_time_lib_Data_Time_Clock_Internal_CTimespec.hsc) = 588270767f8a9cbde0648fc99807891fef65d721
41SHA1 (patch-libraries_time_lib_Data_Time_Clock_Internal_CTimeval.hs) = b2811ec4a845e6b2b44414e940b6108178b597c5 42SHA1 (patch-libraries_time_lib_Data_Time_Clock_Internal_CTimeval.hs) = b2811ec4a845e6b2b44414e940b6108178b597c5
42SHA1 (patch-libraries_unix_System_Posix_Env.hsc) = e94936c139ca15d45cac4a7feb74a601567913ab 43SHA1 (patch-libraries_unix_System_Posix_Env.hsc) = e94936c139ca15d45cac4a7feb74a601567913ab
43SHA1 (patch-libraries_unix_System_Posix_Env_ByteString.hsc) = 3f675fc5d6bf5cc59a2d5ccffeb9ccd51521645a 44SHA1 (patch-libraries_unix_System_Posix_Env_ByteString.hsc) = 3f675fc5d6bf5cc59a2d5ccffeb9ccd51521645a
44SHA1 (patch-libraries_unix_System_Posix_Files_Common.hsc) = 6efef280832d376915a8987e4e8aac283408f607 45SHA1 (patch-libraries_unix_System_Posix_Files_Common.hsc) = 6efef280832d376915a8987e4e8aac283408f607
45SHA1 (patch-libraries_unix_System_Posix_Signals.hsc) = 49215dce493a6bbc440f91a3959e592f86fc779b 46SHA1 (patch-libraries_unix_System_Posix_Signals.hsc) = 49215dce493a6bbc440f91a3959e592f86fc779b
46SHA1 (patch-libraries_unix_include_execvpe.h) = 67dd9720a71a6a55bbe2b50e61621ca60187ef00 47SHA1 (patch-libraries_unix_include_execvpe.h) = 67dd9720a71a6a55bbe2b50e61621ca60187ef00
47SHA1 (patch-rts_StgCRun.c) = 121c7bd714725d5b14a3cbb03d81b1c769848824 48SHA1 (patch-rts_StgCRun.c) = 121c7bd714725d5b14a3cbb03d81b1c769848824
 49SHA1 (patch-rules_distdir-way-opts.mk) = 1430f03c2dfc3462a68002c76bfefcf38622429b
File Added: pkgsrc/lang/ghc88/patches/patch-ghc.mk
$NetBSD: patch-ghc.mk,v 1.1 2021/04/28 15:39:23 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.

--- ghc.mk.orig	2020-07-08 16:43:03.000000000 +0000
+++ ghc.mk
@@ -959,7 +959,7 @@ endif
 
 INSTALLED_PACKAGE_CONF=$(DESTDIR)$(topdir)/package.conf.d
 
-ifeq "$(BINDIST) $(CrossCompiling)" "NO YES"
+ifeq "UseWrappers" "UseWrappers"
 # 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
File Added: pkgsrc/lang/ghc88/patches/patch-rules_distdir-way-opts.mk
$NetBSD: patch-rules_distdir-way-opts.mk,v 1.3 2021/04/28 15:39:23 pho Exp $

Use correct RPATHs.

--- rules/distdir-way-opts.mk.orig	2020-07-08 16:43:04.000000000 +0000
+++ rules/distdir-way-opts.mk
@@ -209,7 +209,7 @@ ifneq "$4" "0"
 ifeq "$$(TargetElf)" "YES"
 $1_$2_$3_GHC_LD_OPTS += \
     -fno-use-rpaths \
-    $$(foreach d,$$($1_$2_TRANSITIVE_DEP_COMPONENT_IDS),-optl-Wl$$(comma)-rpath -optl-Wl$$(comma)'$$$$ORIGIN/../$$d') -optl-Wl,-zorigin
+    $$(foreach d,$$($1_$2_TRANSITIVE_DEP_COMPONENT_IDS),-optl-Wl$$(comma)-rpath -optl-Wl$$(comma)$$(ghclibdir)/$$d)
 else ifeq "$$(TargetOS_CPP)" "darwin"
 $1_$2_$3_GHC_LD_OPTS += \
     -fno-use-rpaths \