Attachment #159455 for bug #196899

Lines 12-18 Link Here

(-)Makefile (-2 / +20 lines)
12	MAINTAINER= haskell@FreeBSD.org	12	MAINTAINER= haskell@FreeBSD.org
13	COMMENT= Compiler for the functional language Haskell	13	COMMENT= Compiler for the functional language Haskell
14		14
15	ONLY_FOR_ARCHS= i386 amd64	15	ONLY_FOR_ARCHS= i386 amd64 armv6
16		16
17	MAKE_JOBS_NUMBER_LIMIT= 4	17	MAKE_JOBS_NUMBER_LIMIT= 4
18		18
Lines 75-82 Link Here
75		75
76	BOOT_GHC_VERSION= 7.6.3	76	BOOT_GHC_VERSION= 7.6.3
77		77
78	.if ${ARCH} == "i386"	78	.if ${ARCH} == "armv6"
79		79
		80	BOOT_GHC_VERSION= 7.8.3
		81	.if ${OSVERSION} >= 1100077
		82	DISTFILES+= ghc-${BOOT_GHC_VERSION}-arm-freebsd11-boot${EXTRACT_SUFX}:boot
		83	.endif
		84
		85	.elif ${ARCH} == "i386"
		86
80	.if ${OSVERSION} >= 1000043	87	.if ${OSVERSION} >= 1000043
81	DISTFILES+= ghc-${BOOT_GHC_VERSION}-i386-freebsd10-boot${EXTRACT_SUFX}:boot	88	DISTFILES+= ghc-${BOOT_GHC_VERSION}-i386-freebsd10-boot${EXTRACT_SUFX}:boot
82	.elif ${OSVERSION} >= 900000	89	.elif ${OSVERSION} >= 900000
Lines 115-120 Link Here
115	CONFIGURE_ARGS+= --with-iconv-includes=${LOCALBASE}/include \	122	CONFIGURE_ARGS+= --with-iconv-includes=${LOCALBASE}/include \
116	--with-iconv-libraries=${LOCALBASE}/lib	123	--with-iconv-libraries=${LOCALBASE}/lib
117		124
		125	.if ${ARCH} == "armv6"
		126	CONFIGURE_ARGS+= --enable-unregisterised
		127	.endif
		128
118	.if ${PORT_OPTIONS:MDYNAMIC}	129	.if ${PORT_OPTIONS:MDYNAMIC}
119	CONFIGURE_ARGS+= --with-system-libffi \	130	CONFIGURE_ARGS+= --with-system-libffi \
120	--with-ffi-includes=${LOCALBASE}/include \	131	--with-ffi-includes=${LOCALBASE}/include \
Lines 196-201 Link Here
196	@${ECHO} >> ${WRKSRC}/mk/build.mk "mandir = ${PREFIX}/man"	207	@${ECHO} >> ${WRKSRC}/mk/build.mk "mandir = ${PREFIX}/man"
197	@${ECHO} >> ${WRKSRC}/mk/build.mk "infodir = ${PREFIX}/info"	208	@${ECHO} >> ${WRKSRC}/mk/build.mk "infodir = ${PREFIX}/info"
198	@${ECHO} >> ${WRKSRC}/mk/build.mk "GhcLibWays = v"	209	@${ECHO} >> ${WRKSRC}/mk/build.mk "GhcLibWays = v"
		210	.if ${ARCH} == "armv6"
		211	@${ECHO} >> ${WRKSRC}/mk/build.mk "SRC_HC_OPTS += -O0 -fasm"
		212	@${ECHO} >> ${WRKSRC}/mk/build.mk "GhcStage1HcOpts = -O -fasm"
		213	@${ECHO} >> ${WRKSRC}/mk/build.mk "GhcStage2HcOpts = -O -fasm"
		214	@${ECHO} >> ${WRKSRC}/mk/build.mk "GhcLibHcOpts = -O -fasm"
		215	.endif
		216
199	.if ${PORT_OPTIONS:MPROFILE}	217	.if ${PORT_OPTIONS:MPROFILE}
200	@${ECHO} >> ${WRKSRC}/mk/build.mk "GhcLibWays += p"	218	@${ECHO} >> ${WRKSRC}/mk/build.mk "GhcLibWays += p"
201	.endif	219	.endif

Lines 14-16 Link Here

(-)distinfo (+2 lines)
14	SIZE (ghc-7.6.3-i386-freebsd10-boot.tar.bz2) = 55512004	14	SIZE (ghc-7.6.3-i386-freebsd10-boot.tar.bz2) = 55512004
15	SHA256 (ghc-7.6.3-amd64-freebsd10-boot.tar.bz2) = 8ce856cbd5b9fa230d17bc3d28b96206d84dce4aa3c1c9c7016262ff132271ad	15	SHA256 (ghc-7.6.3-amd64-freebsd10-boot.tar.bz2) = 8ce856cbd5b9fa230d17bc3d28b96206d84dce4aa3c1c9c7016262ff132271ad
16	SIZE (ghc-7.6.3-amd64-freebsd10-boot.tar.bz2) = 55418435	16	SIZE (ghc-7.6.3-amd64-freebsd10-boot.tar.bz2) = 55418435
		17	SHA256 (ghc-7.8.3-arm-freebsd11-boot.tar.bz2) = 4a537d0ec47bbf7f4d6de7a451bea2187ea7a06cb0fded780a887591f0729dd2
		18	SIZE (ghc-7.8.3-arm-freebsd11-boot.tar.bz2) = 100450855

Lines 5-11 Link Here

(-)files/patch-configure.ac (-1 / +1 lines)
5	dnl --------------------------------------------------------------	5	dnl --------------------------------------------------------------
6	CrossCompiling=NO	6	CrossCompiling=NO
7	+	7	+
8	+build=`echo $build \| sed -e 's/amd64-/x86_64-/g; s/-freebsd.*$/-freebsd/g'`	8	+build=`echo $build \| sed -e 's/amd64-/x86_64-/g; s/armv6-/arm-/g; s/-freebsd.*$/-freebsd/g'`
9	+	9	+
10	# If 'host' and 'target' differ, then this means we are building a cross-compiler.	10	# If 'host' and 'target' differ, then this means we are building a cross-compiler.
11	if test "$target" != "$host" ; then	11	if test "$target" != "$host" ; then

Return to bug 196899