Attachment 159455 Details for Bug 196899 – armv6 fix

[patch] armv6 fix

lang_ghc.patch (text/plain), 2.49 KB, created by Mikael Urankar on 2015-08-02 08:46:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mikael Urankar

Created: 2015-08-02 08:46:19 UTC

Size: 2.49 KB

patch

obsolete

>--- Makefile	(revision 391762)
>+++ Makefile	(working copy)
>@@ -12,7 +12,7 @@
> MAINTAINER=	haskell@FreeBSD.org
> COMMENT=	Compiler for the functional language Haskell
> 
>-ONLY_FOR_ARCHS=	i386 amd64
>+ONLY_FOR_ARCHS=	i386 amd64 armv6
> 
> MAKE_JOBS_NUMBER_LIMIT=		4
> 
>@@ -75,8 +75,15 @@
> 
> BOOT_GHC_VERSION=	7.6.3
> 
>-.if ${ARCH} == "i386"
>+.if ${ARCH} == "armv6"
> 
>+BOOT_GHC_VERSION=	7.8.3
>+.if ${OSVERSION} >= 1100077
>+DISTFILES+=	ghc-${BOOT_GHC_VERSION}-arm-freebsd11-boot${EXTRACT_SUFX}:boot
>+.endif
>+
>+.elif ${ARCH} == "i386"
>+
> .if ${OSVERSION} >= 1000043
> DISTFILES+=	ghc-${BOOT_GHC_VERSION}-i386-freebsd10-boot${EXTRACT_SUFX}:boot
> .elif ${OSVERSION} >= 900000
>@@ -115,6 +122,10 @@
> CONFIGURE_ARGS+=	--with-iconv-includes=${LOCALBASE}/include \
> 			--with-iconv-libraries=${LOCALBASE}/lib
> 
>+.if ${ARCH} == "armv6"
>+CONFIGURE_ARGS+=	--enable-unregisterised
>+.endif
>+
> .if ${PORT_OPTIONS:MDYNAMIC}
> CONFIGURE_ARGS+=	--with-system-libffi \
> 			--with-ffi-includes=${LOCALBASE}/include \
>@@ -196,6 +207,13 @@
> 	@${ECHO} >> ${WRKSRC}/mk/build.mk "mandir = ${PREFIX}/man"
> 	@${ECHO} >> ${WRKSRC}/mk/build.mk "infodir = ${PREFIX}/info"
> 	@${ECHO} >> ${WRKSRC}/mk/build.mk "GhcLibWays = v"
>+.if ${ARCH} == "armv6"
>+	@${ECHO} >> ${WRKSRC}/mk/build.mk "SRC_HC_OPTS += -O0 -fasm"
>+	@${ECHO} >> ${WRKSRC}/mk/build.mk "GhcStage1HcOpts = -O -fasm"
>+	@${ECHO} >> ${WRKSRC}/mk/build.mk "GhcStage2HcOpts = -O -fasm"
>+	@${ECHO} >> ${WRKSRC}/mk/build.mk "GhcLibHcOpts = -O -fasm"
>+.endif
>+
> .if ${PORT_OPTIONS:MPROFILE}
> 	@${ECHO} >> ${WRKSRC}/mk/build.mk "GhcLibWays += p"
> .endif
>
>
>--- distinfo	(revision 391762)
>+++ distinfo	(working copy)
>@@ -14,3 +14,5 @@
> SIZE (ghc-7.6.3-i386-freebsd10-boot.tar.bz2) = 55512004
> SHA256 (ghc-7.6.3-amd64-freebsd10-boot.tar.bz2) = 8ce856cbd5b9fa230d17bc3d28b96206d84dce4aa3c1c9c7016262ff132271ad
> SIZE (ghc-7.6.3-amd64-freebsd10-boot.tar.bz2) = 55418435
>+SHA256 (ghc-7.8.3-arm-freebsd11-boot.tar.bz2) = 4a537d0ec47bbf7f4d6de7a451bea2187ea7a06cb0fded780a887591f0729dd2
>+SIZE (ghc-7.8.3-arm-freebsd11-boot.tar.bz2) = 100450855
>
>
>
>--- files/patch-configure.ac	(revision 391762)
>+++ files/patch-configure.ac	(working copy)
>@@ -5,7 +5,7 @@
>  dnl --------------------------------------------------------------
>  CrossCompiling=NO
> +
>-+build=`echo $build | sed -e 's/amd64-/x86_64-/g; s/-freebsd.*$/-freebsd/g'`
>++build=`echo $build | sed -e 's/amd64-/x86_64-/g; s/armv6-/arm-/g; s/-freebsd.*$/-freebsd/g'`
> +
>  # If 'host' and 'target' differ, then this means we are building a cross-compiler.
>  if test "$target" != "$host" ; then

Actions: View | Diff

Attachments on bug 196899: 159455 | 192347 | 192349 | 193949