Attachment 182206 Details for Bug 196857 – nhc98.diff

[patch] nhc98.diff

nhc98.diff (text/plain), 2.00 KB, created by Tobias Kortkamp on 2017-05-01 09:25:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tobias Kortkamp

Created: 2017-05-01 09:25:16 UTC

Size: 2.00 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 439438)
>+++ Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	nhc98
> PORTVERSION=	1.22
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	lang haskell
> MASTER_SITES=	http://haskell.org/${PORTNAME}/
> DISTFILES=	${PORTNAME}src-${PORTVERSION}${EXTRACT_SUFX}
>@@ -14,14 +14,11 @@
> 
> ONLY_FOR_ARCHS=	i386
> 
>-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
>-
> USES=		gmake
>-# Fails to build with GCC 4.9, cf. PR 196857.
>-USE_GCC=	4.8
>+USE_GCC=	yes
> 
> HAS_CONFIGURE=		yes
>-CONFIGURE_ARGS+=	--prefix=${PREFIX} --heap=4M
>+CONFIGURE_ARGS+=	--prefix=${PREFIX} --heap=4M --buildwith=gcc
> MAKE_ARGS+=		ARCH=
> MAKE_JOBS_UNSAFE=	yes
> 
>@@ -35,6 +32,10 @@
> 
> post-patch:
> 	@${REINPLACE_CMD} -e 's|-O3|${CFLAGS}|' ${WRKSRC}/Makefile.inc
>+# The Makefile defines target names based on $(CC) which is
>+# problematic when CC=gcc5.  The following patch does not affect the
>+# compiler used during the build, but makes sure that targets have
>+# the correct suffix e.g. 'basic-gcc' instead of 'basic-gcc5':
> 	@${REINPLACE_CMD} -e 's|$$(CC)|gcc|g' ${WRKSRC}/Makefile
> 
> post-configure:
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 439438)
>+++ pkg-plist	(working copy)
>@@ -224,6 +224,8 @@
> include/nhc98/packages/base/Text/Read.hi
> include/nhc98/packages/base/Text/Show.hi
> include/nhc98/packages/base/Text/Show/Functions.hi
>+@dir include/nhc98/packages/base/Text/Html
>+@dir include/nhc98/packages/base/Text/Regex
> include/nhc98/packages/base/Typeable.h
> include/nhc98/packages/base/Unsafe/Coerce.hi
> include/nhc98/packages/bytestring.cabal
>@@ -249,6 +251,7 @@
> include/nhc98/packages/filepath/System/FilePath.hi
> include/nhc98/packages/filepath/System/FilePath/Posix.hi
> include/nhc98/packages/filepath/System/FilePath/Windows.hi
>+@dir include/nhc98/packages/haskell98
> include/nhc98/packages/haskell98.cabal
> include/nhc98/packages/old-locale.cabal
> include/nhc98/packages/old-locale/System/Locale.hi

Flags:

tobik: maintainer-approval? (haskell)

Actions: View | Diff

Attachments on bug 196857: 182206