View | Details | Raw Unified | Return to bug 245057 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (-19 / +4 lines)
Lines 21-27 Link Here
21
# other supported arches are added based on GHC_VERSION below
21
# other supported arches are added based on GHC_VERSION below
22
ONLY_FOR_ARCHS=	amd64 i386
22
ONLY_FOR_ARCHS=	amd64 i386
23
23
24
USES=			autoreconf gmake iconv:translit localbase:ldflags ncurses perl5 tar:xz
24
USES=			autoreconf compiler:c11 gmake iconv:translit \
25
			localbase:ldflags ncurses perl5 tar:xz
25
USE_LOCALE=		en_US.UTF-8
26
USE_LOCALE=		en_US.UTF-8
26
USE_PERL5=		build
27
USE_PERL5=		build
27
GNU_CONFIGURE=		yes
28
GNU_CONFIGURE=		yes
Lines 102-112 Link Here
102
CONFIGURE_ARGS+=	--enable-dtrace=0
103
CONFIGURE_ARGS+=	--enable-dtrace=0
103
.endif
104
.endif
104
105
105
.if ${ARCH} == amd64 || ${ARCH} == i386 || (defined(PPC_ABI) && ${PPC_ABI} == ELFv2)
106
BOOT_GHC_VERSION=	8.6.5
106
BOOT_GHC_VERSION=	8.6.5
107
.else
108
BOOT_GHC_VERSION=	8.6.3
109
.endif
110
107
111
# LLVM version that bootstrap compiler uses
108
# LLVM version that bootstrap compiler uses
112
BOOT_LLVM_VERSION=	60
109
BOOT_LLVM_VERSION=	60
Lines 168-177 Link Here
168
.endif
165
.endif
169
166
170
.if ${ARCH} == aarch64 || ${ARCH} == armv6 || ${ARCH} == armv7 || ${ARCH} == powerpc64
167
.if ${ARCH} == aarch64 || ${ARCH} == armv6 || ${ARCH} == armv7 || ${ARCH} == powerpc64
171
USE_GCC=	yes
168
.  if ${OSVERSION} < 1201000
172
169
IGNORE=	lang/ghc requires at least FreeBSD 12.1-RELEASE
173
.  if ${OSVERSION} < 1200086
174
IGNORE=	lang/ghc requires at least FreeBSD 12.0-RELEASE
175
.  endif
170
.  endif
176
.  ifdef QEMU_EMULATING
171
.  ifdef QEMU_EMULATING
177
IGNORE=	qemu-user-static isn't able to build lang/ghc, but it builds fine on a real hardware
172
IGNORE=	qemu-user-static isn't able to build lang/ghc, but it builds fine on a real hardware
Lines 178-188 Link Here
178
.  endif
173
.  endif
179
.endif
174
.endif
180
175
181
# Use binutils strip if we are using gcc, as it is faster that base one. See PR 234949
182
.if defined(USE_GCC)
183
CONFIGURE_ENV+=	STRIP=${LOCALBASE}/bin/strip
184
.endif
185
186
PLIST_SUB+=	GHC_VERSION=${GHC_VERSION} GHC_LIBDIR=${GHC_LIBDIR_REL}
176
PLIST_SUB+=	GHC_VERSION=${GHC_VERSION} GHC_LIBDIR=${GHC_LIBDIR_REL}
187
177
188
.if empty(PORT_OPTIONS:MBOOT)
178
.if empty(PORT_OPTIONS:MBOOT)
Lines 232-242 Link Here
232
		s|%%AR%%|${AR}|; \
222
		s|%%AR%%|${AR}|; \
233
		s|%%LD%%|${LD}|' \
223
		s|%%LD%%|${LD}|' \
234
		${WRKSRC}/libraries/Cabal/Cabal/Distribution/Simple/Program/Builtin.hs
224
		${WRKSRC}/libraries/Cabal/Cabal/Distribution/Simple/Program/Builtin.hs
235
# we must use binutils:ld on arm
236
.if ${ARCH} == aarch64 || ${ARCH} == armv6 || ${ARCH} == armv7
237
	@${REINPLACE_CMD} -e 's|LD_NO_GOLD=ld|LD_NO_GOLD=${LOCALBASE}/bin/ld|' \
238
		${WRKSRC}/aclocal.m4
239
.endif
240
225
241
	@${REINPLACE_CMD} -e 's/@SettingsLlcCommand@/llc${LLVM_VERSION}/' ${WRKSRC}/settings.in
226
	@${REINPLACE_CMD} -e 's/@SettingsLlcCommand@/llc${LLVM_VERSION}/' ${WRKSRC}/settings.in
242
	@${REINPLACE_CMD} -e 's/@SettingsOptCommand@/opt${LLVM_VERSION}/' ${WRKSRC}/settings.in
227
	@${REINPLACE_CMD} -e 's/@SettingsOptCommand@/opt${LLVM_VERSION}/' ${WRKSRC}/settings.in
(-)distinfo (-8 / +11 lines)
Lines 19-33 Link Here
19
SIZE (ghc-8.6.5-boot-amd64-freebsd11.tar.xz) = 68965716
19
SIZE (ghc-8.6.5-boot-amd64-freebsd11.tar.xz) = 68965716
20
SHA256 (ghc-8.6.5-boot-i386-freebsd11.tar.xz) = cd208fbb6b2a158ff8c5d6227e0babd8c224867ea301abf970dc446f04c9e95f
20
SHA256 (ghc-8.6.5-boot-i386-freebsd11.tar.xz) = cd208fbb6b2a158ff8c5d6227e0babd8c224867ea301abf970dc446f04c9e95f
21
SIZE (ghc-8.6.5-boot-i386-freebsd11.tar.xz) = 67439136
21
SIZE (ghc-8.6.5-boot-i386-freebsd11.tar.xz) = 67439136
22
SHA256 (ghc-8.6.3-boot-aarch64-freebsd.tar.xz) = 5a1f043ada7262cf4eac4a900b7d5af965e5f6f89939e635ad0c10b0185a15b7
22
SHA256 (ghc-8.6.5-boot-aarch64-freebsd.tar.xz) = 63d461161c87132a3c3d3683c4995f4209e139fe719a25e551a600412c11aa3e
23
SIZE (ghc-8.6.3-boot-aarch64-freebsd.tar.xz) = 104631584
23
SIZE (ghc-8.6.5-boot-aarch64-freebsd.tar.xz) = 136306580
24
SHA256 (ghc-8.6.3-boot-armv6-freebsd.tar.xz) = 5260987646c9f6102f35a7cdedfde785227c4f317fb3ccc52d06cae6a0950a68
24
SHA256 (ghc-8.6.5-boot-armv6-freebsd.tar.xz) = 1fe5f4f5d1bfec5d45b0f92101b5be818b221c730655a4f1b31ecbb8382b7108
25
SIZE (ghc-8.6.3-boot-armv6-freebsd.tar.xz) = 113748008
25
SIZE (ghc-8.6.5-boot-armv6-freebsd.tar.xz) = 136889664
26
SHA256 (ghc-8.6.3-boot-armv7-freebsd.tar.xz) = 765d01199ceb0dfa5c84de692cec427e67ae1cf1ba6e1fc20e7ca854c6ceb556
26
SHA256 (ghc-8.6.5-boot-armv7-freebsd.tar.xz) = ce4bc7fd20bb420963081171e483beb7387f9704323f7c03e36bbf3bf68a00ea
27
SIZE (ghc-8.6.3-boot-armv7-freebsd.tar.xz) = 114046668
27
SIZE (ghc-8.6.5-boot-armv7-freebsd.tar.xz) = 135237856
28
SHA256 (ghc-8.6.5-boot-powerpc64-freebsd-elfv2.tar.xz) = 89dfbfab84aef489ca9d0ff6fdf97152cff2412f6a8b9b1e57025b2019908318
28
SHA256 (ghc-8.6.5-boot-powerpc64-freebsd-elfv2.tar.xz) = 58eb128409a69b1b19f92b3c4090b6a023fd22f539b8b8013a7b6bf4b264d916
29
SIZE (ghc-8.6.5-boot-powerpc64-freebsd-elfv2.tar.xz) = 113782560
29
SIZE (ghc-8.6.5-boot-powerpc64-freebsd-elfv2.tar.xz) = 112469852
30
SHA256 (ghc-8.6.3-boot-powerpc64-freebsd-elfv1.tar.xz) = fb9bd4bad3a54722b7012c0a531cbdfe71b3b20a0b92cbd52195a526dc5ccde4
30
SHA256 (ghc-8.6.3-boot-powerpc64-freebsd-elfv1.tar.xz) = fb9bd4bad3a54722b7012c0a531cbdfe71b3b20a0b92cbd52195a526dc5ccde4
31
SIZE (ghc-8.6.3-boot-powerpc64-freebsd-elfv1.tar.xz) = 112652192
31
SIZE (ghc-8.6.3-boot-powerpc64-freebsd-elfv1.tar.xz) = 112652192
32
SHA256 (hscolour-1.24.4.tar.gz) = 243332b082294117f37b2c2c68079fa61af68b36223b3fc07594f245e0e5321d
32
SHA256 (hscolour-1.24.4.tar.gz) = 243332b082294117f37b2c2c68079fa61af68b36223b3fc07594f245e0e5321d
33
SIZE (hscolour-1.24.4.tar.gz) = 28729
33
SIZE (hscolour-1.24.4.tar.gz) = 28729
34
35
 	
36
(-)files/patch-utils_iserv_ghc.mk (+11 lines)
Line 0 Link Here
1
--- utils/iserv/ghc.mk.orig	2020-03-23 22:25:01 UTC
2
+++ utils/iserv/ghc.mk
3
@@ -31,7 +31,7 @@ endif
4
 # of overhead to startup and increases the binary sizes) but if you
5
 # need it there's no alternative.
6
 ifeq "$(TargetElf)" "YES"
7
-ifneq "$(TargetOS_CPP)" "solaris2"
8
+ifeq "$(findstring $(TargetOS_CPP), solaris2 freebsd)" ""
9
 # The Solaris linker does not support --export-dynamic option. It also
10
 # does not need it since it exports all dynamic symbols by default
11
 utils/iserv_stage2_MORE_HC_OPTS += -optl-Wl,--export-dynamic

Return to bug 245057