Attachment 159234 Details for Bug 201886 – Patch.diff

[patch] Patch.diff

patch-ghc.diff (text/plain), 4.79 KB, created by Andriy Voskoboinyk on 2015-07-26 07:51:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andriy Voskoboinyk

Created: 2015-07-26 07:51:37 UTC

Size: 4.79 KB

patch

obsolete

>Index: lang/ghc/Makefile
>===================================================================
>--- lang/ghc/Makefile	(revision 392908)
>+++ lang/ghc/Makefile	(working copy)
>@@ -12,6 +12,9 @@
> MAINTAINER=	haskell@FreeBSD.org
> COMMENT=	Compiler for the functional language Haskell
> 
>+LICENSE=	BSD3CLAUSE
>+LICENSE_FILE=	${WRKSRC}/LICENSE
>+
> ONLY_FOR_ARCHS=	i386 amd64
> 
> MAKE_JOBS_NUMBER_LIMIT=		4
>@@ -28,13 +31,10 @@
> 
> USE_AUTOTOOLS=		autoconf autoheader
> USE_PERL5=		build
>-USES=			gmake iconv:translit perl5 ncurses tar:bzip2
>+USES=			gmake iconv:translit ncurses perl5 tar:bzip2
> USE_BINUTILS=		yes
> USE_GCC=		yes
> 
>-LICENSE=	BSD3CLAUSE
>-LICENSE_FILE=	${WRKSRC}/LICENSE
>-
> MAKE_ENV=	LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8
> 
> # The configure process accepts,filters and canonicalises
>Index: lang/ghc/bsd.cabal.mk
>===================================================================
>--- lang/ghc/bsd.cabal.mk	(revision 392908)
>+++ lang/ghc/bsd.cabal.mk	(working copy)
>@@ -13,13 +13,7 @@
> MASTER_SITES?=	http://hackage.haskell.org/package/${PORTNAME}-${PORTVERSION}/
> DIST_SUBDIR?=	cabal
> .else
>-MASTER_SITES=	# empty
>-DISTFILES=	# empty
>-EXTRACT_ONLY=	# empty
>-NO_FETCH=	yes
>-NO_BUILD=	yes
>-NO_INSTALL=	yes
>-NO_MTREE=	yes
>+USES+=		metaport
> .endif # !METAPORT
> 
> MAKE_ENV+=	LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 DESTDIR=${STAGEDIR} \
>Index: lang/ghc/files/patch-aclocal.m4
>===================================================================
>--- lang/ghc/files/patch-aclocal.m4	(revision 392908)
>+++ lang/ghc/files/patch-aclocal.m4	(working copy)
>@@ -1,6 +1,6 @@
>---- ./aclocal.m4.orig	2014-07-10 06:27:16.000000000 +0200
>-+++ ./aclocal.m4	2014-07-11 11:23:41.000000000 +0200
>-@@ -47,6 +47,8 @@
>+--- aclocal.m4.orig	2014-07-10 04:27:16 UTC
>++++ aclocal.m4
>+@@ -47,6 +47,8 @@ AC_DEFUN([FPTOOLS_SET_PLATFORM_VARS],
>      # In bindists, we haven't called AC_CANONICAL_{BUILD,HOST,TARGET}
>      # so this justs uses $bootstrap_target.
>  
>@@ -9,7 +9,7 @@
>      if test "$build_alias" = ""
>      then
>          if test "$bootstrap_target" != ""
>-@@ -1817,7 +1819,7 @@
>+@@ -1817,7 +1819,7 @@ AC_MSG_NOTICE(Building in-tree ghc-pwd)
>      dnl If special linker flags are needed to build things, then allow
>      dnl the user to pass them in via LDFLAGS.
>      changequote(, )dnl
>Index: lang/ghc/files/patch-configure.ac
>===================================================================
>--- lang/ghc/files/patch-configure.ac	(revision 392908)
>+++ lang/ghc/files/patch-configure.ac	(working copy)
>@@ -1,6 +1,6 @@
>---- ./configure.ac.orig	2014-07-10 07:04:42.000000000 +0200
>-+++ ./configure.ac	2014-07-11 10:27:40.000000000 +0200
>-@@ -435,6 +435,9 @@
>+--- configure.ac.orig	2014-07-10 05:04:42 UTC
>++++ configure.ac
>+@@ -435,6 +435,9 @@ AC_SUBST([SplitObjsBroken])
>  dnl ** Building a cross compiler?
>  dnl --------------------------------------------------------------
>  CrossCompiling=NO
>@@ -10,7 +10,7 @@
>  # If 'host' and 'target' differ, then this means we are building a cross-compiler.
>  if test "$target" != "$host" ; then
>      CrossCompiling=YES
>-@@ -914,7 +917,6 @@
>+@@ -914,7 +917,6 @@ FP_LEADING_UNDERSCORE
>  FP_VISIBILITY_HIDDEN
>  
>  dnl ** check for librt
>Index: lang/ghc/files/patch-ghc.mk
>===================================================================
>--- lang/ghc/files/patch-ghc.mk	(revision 392908)
>+++ lang/ghc/files/patch-ghc.mk	(working copy)
>@@ -1,6 +1,6 @@
>---- ./ghc.mk.orig	2014-07-10 06:27:16.000000000 +0200
>-+++ ./ghc.mk	2014-07-11 10:28:11.000000000 +0200
>-@@ -96,6 +96,7 @@
>+--- ghc.mk.orig	2014-07-10 04:27:16 UTC
>++++ ghc.mk
>+@@ -96,6 +96,7 @@ endif
>  # Catch make if it runs away into an infinite loop
>  ifeq      "$(MAKE_RESTARTS)" ""
>  else ifeq "$(MAKE_RESTARTS)" "1"
>Index: lang/ghc/files/patch-libraries__Cabal__Cabal__Distribution__Simple__Program__Builtin.hs
>===================================================================
>--- lang/ghc/files/patch-libraries__Cabal__Cabal__Distribution__Simple__Program__Builtin.hs	(revision 392908)
>+++ lang/ghc/files/patch-libraries__Cabal__Cabal__Distribution__Simple__Program__Builtin.hs	(working copy)
>@@ -1,6 +1,6 @@
>---- ./libraries/Cabal/Cabal/Distribution/Simple/Program/Builtin.hs.orig	2014-07-10 06:34:21.000000000 +0200
>-+++ ./libraries/Cabal/Cabal/Distribution/Simple/Program/Builtin.hs	2014-07-26 23:57:20.869626927 +0200
>-@@ -198,13 +198,18 @@
>+--- libraries/Cabal/Cabal/Distribution/Simple/Program/Builtin.hs.orig	2014-07-10 04:34:21 UTC
>++++ libraries/Cabal/Cabal/Distribution/Simple/Program/Builtin.hs
>+@@ -198,13 +198,18 @@ alexProgram = (simpleProgram "alex") {
>  gccProgram :: Program
>  gccProgram = (simpleProgram "gcc") {
>      programFindVersion = findProgramVersion "-dumpversion" id
>@@ -21,7 +21,7 @@
>  
>  stripProgram :: Program
>  stripProgram = simpleProgram "strip"
>-@@ -257,7 +262,9 @@
>+@@ -257,7 +262,9 @@ greencardProgram :: Program
>  greencardProgram = simpleProgram "greencard"
>  
>  ldProgram :: Program

Actions: View | Diff

Attachments on bug 201886: 159234 | 159235 | 159236 | 159237