7 files changed, 78 insertions, 56 deletions

diff --git a/lang/ghc/files/build.boot.mk.in b/lang/ghc/files/build.boot.mk.in
new file mode 100644
index 000000000000..557732a69a03
--- /dev/null
+++ b/lang/ghc/files/build.boot.mk.in
@@ -0,0 +1,8 @@
+GhcLibWays = v
+XMLDocWays =
+HADDOCK_DOCS =
+HSCOLOUR_SRCS =
+INTEGER_LIBRARY = integer-simple
+DYNAMIC_GHC_PROGRAMS =
+BIN_DIST_NAME = ghc-%%GHC_VERSION%%-boot
+BIN_DIST_TAR  = ghc-%%GHC_VERSION%%-boot.tar
diff --git a/lang/ghc/files/build.mk.in b/lang/ghc/files/build.mk.in
new file mode 100644
index 000000000000..8bbbb04ae120
--- /dev/null
+++ b/lang/ghc/files/build.mk.in
@@ -0,0 +1,19 @@
+docdir = %%PREFIX%%/share/doc/ghc-%%GHC_VERSION%%
+htmldir = %%PREFIX%%/share/doc/ghc-%%GHC_VERSION%%
+mandir = %%PREFIX%%/man
+infodir = %%PREFIX%%/info
+GhcLibWays = v
+%%WITH_PROFILE%%GhcLibWays += p
+%%WITH_DYNAMIC%%GhcLibWays += dyn
+DYNAMIC_GHC_PROGRAMS = %%WITH_DYNAMIC%%YES
+HADDOCK_DOCS = %%WITH_DOCS%%
+HSCOLOUR_SRCS = %%WITH_DOCS%%
+BSD_PATH_TO_HSC2HS = %%HSC2HS%%
+SRC_HC_OPTS += -I%%NCURSESINC%% -L%%NCURSESLIB%% -I%%LOCALBASE%%/include -L%%LOCALBASE%%/lib
+SRC_CC_OPTS += %%CFLAGS%%
+EXTRA_HSC2HS_OPTS += -I%%LOCALBASE%%/include --lflag=-L%%LOCALBASE%%/lib
+EXTRA_LD_OPTS += -L%%LOCALBASE%%/lib
+EXTRA_CABAL_CONFIGURE_FLAGS += --extra-include-dirs=%%LOCALBASE%%/include
+EXTRA_CABAL_CONFIGURE_FLAGS += --extra-lib-dirs=%%LOCALBASE%%/lib
+libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-includes=%%NCURSESINC%% --configure-option=--with-curses-libraries=%%NCURSESLIB%%
+V = 0
diff --git a/lang/ghc/files/patch-aclocal.m4 b/lang/ghc/files/patch-aclocal.m4
deleted file mode 100644
index 550ec1adc5ef..000000000000
--- a/lang/ghc/files/patch-aclocal.m4
+++ /dev/null
@@ -1,39 +0,0 @@
---- aclocal.m4.orig	2015-07-21 13:52:50 UTC
-+++ aclocal.m4
-@@ -1718,36 +1718,6 @@ int main(int argc, char *argv[])
-     }
-     alarm(1);
- 
--    if (timer_create(CLOCK_PROCESS_CPUTIME_ID, &ev, &timer) != 0) {
--        fprintf(stderr,"No CLOCK_PROCESS_CPUTIME_ID timer\n");
--       exit(1);
--    }
--
--    it.it_value.tv_sec = 0;
--    it.it_value.tv_nsec = 1;
--    it.it_interval = it.it_value;
--    if (timer_settime(timer, 0, &it, NULL) != 0) {
--        fprintf(stderr,"settime problem\n");
--        exit(4);
--    }
--
--    tock = 0;
--
--    for(n = 3; n < 20000; n++){
--        for(m = 2; m <= n/2; m++){
--            if (!(n%m)) count++;
--            if (tock) goto out;
--        }
--    }
--out:
--
--    if (!tock) {
--        fprintf(stderr,"no CLOCK_PROCESS_CPUTIME_ID signal\n");
--        exit(5);
--    }
--
--    timer_delete(timer);
--
-     if (timer_create(CLOCK_REALTIME, &ev, &timer) != 0) {
-         fprintf(stderr,"No CLOCK_REALTIME timer\n");
-         exit(2);
diff --git a/lang/ghc/files/patch-configure.ac b/lang/ghc/files/patch-configure.ac
index ddffa1650ae5..8906fbb875dd 100644
--- a/lang/ghc/files/patch-configure.ac
+++ b/lang/ghc/files/patch-configure.ac
@@ -1,6 +1,6 @@
---- configure.ac.orig	2015-07-21 19:50:11 UTC
+--- configure.ac.orig	2017-01-04 14:17:17 UTC
 +++ configure.ac
-@@ -383,6 +383,9 @@ AC_SUBST([SplitObjsBroken])
+@@ -418,6 +418,9 @@ AC_SUBST([SplitObjsBroken])
  dnl ** Building a cross compiler?
  dnl --------------------------------------------------------------
  CrossCompiling=NO
@@ -8,5 +8,17 @@
 +build=`echo $build | sed -e 's/amd64-/x86_64-/g; s/-freebsd.*$/-freebsd/g'`
 +
  # If 'host' and 'target' differ, then this means we are building a cross-compiler.
- if test "$target" != "$host" ; then
+ if test "$TargetPlatform" != "$HostPlatform" ; then
      CrossCompiling=YES
+@@ -1057,6 +1060,11 @@ if test "$ac_cv_sizeof_void_p" -eq 8 ; then
+             use_large_address_space=yes
+ 	elif test "$ghc_host_os" = "openbsd" ; then
+ 	    # as of OpenBSD 5.8 (2015), OpenBSD does not support mmap with MAP_NORESERVE.
++	    # The flag MAP_NORESERVE is supported for source compatibility reasons,
++	    # but is completely ignored by OS mmap
++            use_large_address_space=no
++ 	elif test "$ghc_host_os" = "freebsd" ; then
++	    # FreeBSD does not support mmap with MAP_NORESERVE,r emoved in r273250.
+ 	    # The flag MAP_NORESERVE is supported for source compatibility reasons,
+ 	    # but is completely ignored by OS mmap
+             use_large_address_space=no
diff --git a/lang/ghc/files/patch-ghc.mk b/lang/ghc/files/patch-ghc.mk
index 5467a7ae909b..8ffda7a16712 100644
--- a/lang/ghc/files/patch-ghc.mk
+++ b/lang/ghc/files/patch-ghc.mk
@@ -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	2017-01-03 15:59:18 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"
@@ -8,3 +8,14 @@
  else
  $(error Make has restarted itself $(MAKE_RESTARTS) times; is there a makefile bug? See http://ghc.haskell.org/trac/ghc/wiki/Building/Troubleshooting#Makehasrestarteditself3timesisthereamakefilebug for details)
  endif
+@@ -465,10 +466,7 @@ PACKAGES_STAGE1 += ghc-boot
+ PACKAGES_STAGE1 += template-haskell
+ PACKAGES_STAGE1 += hoopl
+ PACKAGES_STAGE1 += transformers
+-
+-ifeq "$(HADDOCK_DOCS)" "YES"
+ PACKAGES_STAGE1 += xhtml
+-endif
+ 
+ ifeq "$(Windows_Target)" "NO"
+ ifneq "$(TargetOS_CPP)" "ios"
diff --git a/lang/ghc/files/patch-libraries_Cabal_Cabal_Distribution_Simple_GHC.hs b/lang/ghc/files/patch-libraries_Cabal_Cabal_Distribution_Simple_GHC.hs
index 53cf700d7ccc..c7ddc4addf4f 100644
--- a/lang/ghc/files/patch-libraries_Cabal_Cabal_Distribution_Simple_GHC.hs
+++ b/lang/ghc/files/patch-libraries_Cabal_Cabal_Distribution_Simple_GHC.hs
@@ -1,6 +1,6 @@
---- libraries/Cabal/Cabal/Distribution/Simple/GHC.hs.orig	2015-04-01 00:24:45 UTC
+--- libraries/Cabal/Cabal/Distribution/Simple/GHC.hs.orig	2017-01-03 15:59:20 UTC
 +++ libraries/Cabal/Cabal/Distribution/Simple/GHC.hs
-@@ -875,7 +875,7 @@ getRPaths lbi clbi | supportRPaths hostO
+@@ -996,7 +996,7 @@ getRPaths lbi clbi | supportRPaths hostOS = do
      supportRPaths Linux       = True
      supportRPaths Windows     = False
      supportRPaths OSX         = True
diff --git a/lang/ghc/files/patch-libraries__Cabal__Cabal__Distribution__Simple__Program__Builtin.hs b/lang/ghc/files/patch-libraries__Cabal__Cabal__Distribution__Simple__Program__Builtin.hs
index 7a4425743eaa..daf5ea981ba1 100644
--- a/lang/ghc/files/patch-libraries__Cabal__Cabal__Distribution__Simple__Program__Builtin.hs
+++ b/lang/ghc/files/patch-libraries__Cabal__Cabal__Distribution__Simple__Program__Builtin.hs
@@ -1,27 +1,38 @@
---- libraries/Cabal/Cabal/Distribution/Simple/Program/Builtin.hs.orig	2015-06-19 10:36:50 UTC
+--- libraries/Cabal/Cabal/Distribution/Simple/Program/Builtin.hs.orig	2017-01-03 15:59:20 UTC
 +++ libraries/Cabal/Cabal/Distribution/Simple/Program/Builtin.hs
-@@ -261,10 +261,13 @@ alexProgram = (simpleProgram "alex") {
+@@ -54,6 +54,8 @@ import Distribution.Compat.Exception
+ import Distribution.Verbosity
+ import Distribution.Version
+ 
++import System.FilePath (takeDirectory)
++
+ import Data.Char
+          ( isDigit )
+ import qualified Data.Map as Map
+@@ -251,11 +253,13 @@ alexProgram = (simpleProgram "alex") {
+ 
  gccProgram :: Program
  gccProgram = (simpleProgram "gcc") {
-     programFindVersion = findProgramVersion "-dumpversion" id
-+  , programFindLocation = \v p -> findProgramOnSearchPath v p "%%CC%%"
-   }
+-    programFindVersion = findProgramVersion "-dumpversion" id
+-  }
++     programFindLocation = \v p -> findProgramOnSearchPath v p "cc"
++}
  
  arProgram :: Program
 -arProgram = simpleProgram "ar"
 +arProgram = (simpleProgram "ar") {
-+    programFindLocation = \_v _p -> return (Just "%%AR%%")
-+  }
++     programFindLocation = \v p -> findProgramOnSearchPath v p "ar"
++}
  
  stripProgram :: Program
  stripProgram = (simpleProgram "strip") {
-@@ -336,7 +339,9 @@ greencardProgram :: Program
+@@ -311,7 +315,9 @@ greencardProgram :: Program
  greencardProgram = simpleProgram "greencard"
  
  ldProgram :: Program
 -ldProgram = simpleProgram "ld"
 +ldProgram = (simpleProgram "ld") {
-+    programFindLocation = \_v _p -> return (Just "%%LD%%")
++    programFindLocation = \v p -> findProgramOnSearchPath v p "ld"
 +  }
  
  tarProgram :: Program