View | Details | Raw Unified | Return to bug 201886
Collapse All | Expand All

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

Return to bug 201886