[pkgsrc/trunk]: pkgsrc/lang/ghc88 Fix a build failure that happens when alex ...

[pho <pho%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/07d7e0ef2ade
branches:  trunk
changeset: 347490:07d7e0ef2ade
user:      pho <pho%pkgsrc.org@localhost>
date:      Sun Jan 12 08:13:40 2020 +0000

description:
Fix a build failure that happens when alex is not installed

Also added a bookit for Darwin/x86_64.

diffstat:

 lang/ghc88/Makefile                 |   3 ++-
 lang/ghc88/bootstrap.mk             |   8 +++++++-
 lang/ghc88/distinfo                 |   8 ++++++--
 lang/ghc88/patches/patch-aclocal.m4 |  27 +++++++++++++++++++++++----
 4 files changed, 38 insertions(+), 8 deletions(-)

diffs (99 lines):

diff -r 75f5b0b299fc -r 07d7e0ef2ade lang/ghc88/Makefile
--- a/lang/ghc88/Makefile       Sun Jan 12 07:08:13 2020 +0000
+++ b/lang/ghc88/Makefile       Sun Jan 12 08:13:40 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2020/01/09 12:32:24 pho Exp $
+# $NetBSD: Makefile,v 1.2 2020/01/12 08:13:40 pho Exp $
 # -----------------------------------------------------------------------------
 # Package metadata
 #
@@ -21,6 +21,7 @@
 # you want to build them yourself, follow instructions in
 # BOOTSTRAP.txt and ./bootstrap.mk
 #BROKEN_EXCEPT_ON_PLATFORM+=   Darwin-*-powerpc # Not available yet
+BROKEN_EXCEPT_ON_PLATFORM+=    Darwin-*-x86_64
 #BROKEN_EXCEPT_ON_PLATFORM+=   FreeBSD-*-i386   # Not available yet
 BROKEN_EXCEPT_ON_PLATFORM+=    NetBSD-*-x86_64
 #BROKEN_EXCEPT_ON_PLATFORM+=   SunOS-*-i386     # Not available yet
diff -r 75f5b0b299fc -r 07d7e0ef2ade lang/ghc88/bootstrap.mk
--- a/lang/ghc88/bootstrap.mk   Sun Jan 12 07:08:13 2020 +0000
+++ b/lang/ghc88/bootstrap.mk   Sun Jan 12 08:13:40 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bootstrap.mk,v 1.1 2020/01/09 12:32:24 pho Exp $
+# $NetBSD: bootstrap.mk,v 1.2 2020/01/12 08:13:40 pho Exp $
 # -----------------------------------------------------------------------------
 # Select a bindist of bootstrapping compiler on a per-platform basis.
 #
@@ -32,6 +32,12 @@
 #DISTFILES:=   ${DISTFILES} ${BOOT_ARCHIVE} # Available in LOCAL_PORTS
 .endif
 
+.if !empty(MACHINE_PLATFORM:MDarwin-*-x86_64) || make(distinfo) || make (makesum) || make(mdi)
+BOOT_VERSION:= 8.4.4
+BOOT_ARCHIVE:= ghc-${BOOT_VERSION}-boot-x86_64-apple-darwin.tar.xz
+DISTFILES:=    ${DISTFILES} ${BOOT_ARCHIVE} # Available in LOCAL_PORTS
+.endif
+
 .if !empty(MACHINE_PLATFORM:MFreeBSD-*-i386) || make(distinfo) || make (makesum) || make(mdi)
 #BOOT_VERSION:=        8.4.4
 #BOOT_ARCHIVE:=        ghc-${BOOT_VERSION}-boot-i386-unknown-freebsd.tar.xz
diff -r 75f5b0b299fc -r 07d7e0ef2ade lang/ghc88/distinfo
--- a/lang/ghc88/distinfo       Sun Jan 12 07:08:13 2020 +0000
+++ b/lang/ghc88/distinfo       Sun Jan 12 08:13:40 2020 +0000
@@ -1,5 +1,9 @@
-$NetBSD: distinfo,v 1.1 2020/01/09 12:32:24 pho Exp $
+$NetBSD: distinfo,v 1.2 2020/01/12 08:13:40 pho Exp $
 
+SHA1 (ghc-8.4.4-boot-x86_64-apple-darwin.tar.xz) = 688f5729992bd2476699d9067d97e79b06bdec60
+RMD160 (ghc-8.4.4-boot-x86_64-apple-darwin.tar.xz) = 4e9c52c8ef07343cc24528e3f8431754237d0be3
+SHA512 (ghc-8.4.4-boot-x86_64-apple-darwin.tar.xz) = abc92ca6822ba7fe2d09bc381a833c0cbd5f436b517fba003736195cec45f8ce2e33623a587ad35f5702baac791594d62fc829e2ea4dfceae2455875661b3ba6
+Size (ghc-8.4.4-boot-x86_64-apple-darwin.tar.xz) = 51700444 bytes
 SHA1 (ghc-8.4.4-boot-x86_64-unknown-netbsd.tar.xz) = bc7b0e203a6e7e6804c4be46957352d032cd22ec
 RMD160 (ghc-8.4.4-boot-x86_64-unknown-netbsd.tar.xz) = dd50835c50cd2102c1af4d2ed8f1148c8ac4d4d9
 SHA512 (ghc-8.4.4-boot-x86_64-unknown-netbsd.tar.xz) = 0cc836390985c56d79a5c08dd2117c53fc9802b969db408dab14cfd441d95b2b5c18fed5d0b6da8a8555501e668ba471d0b878ea11a0021fba76265ed4ef8f76
@@ -8,7 +12,7 @@
 RMD160 (ghc-8.8.1-src.tar.xz) = c514d565e9f808a58991e47b17dccb85f0c01056
 SHA512 (ghc-8.8.1-src.tar.xz) = 7268b012c3a6c34e7eac05c7d6959de6005651d33e870860bbfe589295502e8794a76580130b8f4da2f88032b68116dbbdbc4c1e900e0c862aaa9891fa788bef
 Size (ghc-8.8.1-src.tar.xz) = 28634672 bytes
-SHA1 (patch-aclocal.m4) = e4065df0cfc2924aa12f7b0f18a58ff80b1ff1dc
+SHA1 (patch-aclocal.m4) = a674a21f5be05f06a972b1dd42c05dca02e70740
 SHA1 (patch-compiler_main_DynFlags.hs) = 07bb2a5afdd087f4d2da5c035feecc13273aec70
 SHA1 (patch-configure.ac) = f521200b519fdaab1082c4a2fcac9c3dd9135d7b
 SHA1 (patch-ghc_ghc.mk) = 331b947f6a5af09b3fda82697f071941166edbd0
diff -r 75f5b0b299fc -r 07d7e0ef2ade lang/ghc88/patches/patch-aclocal.m4
--- a/lang/ghc88/patches/patch-aclocal.m4       Sun Jan 12 07:08:13 2020 +0000
+++ b/lang/ghc88/patches/patch-aclocal.m4       Sun Jan 12 08:13:40 2020 +0000
@@ -1,10 +1,29 @@
-$NetBSD: patch-aclocal.m4,v 1.1 2020/01/09 12:32:24 pho Exp $
+$NetBSD: patch-aclocal.m4,v 1.2 2020/01/12 08:13:41 pho Exp $
 
-Canonicalize OS name netbsd* to "netbsd".
+Hunk #1:
+  Don't require Alex to build. Fixed in upstream:
+  https://gitlab.haskell.org/ghc/ghc/issues/16860
+
+Hunk #2:
+  Canonicalize OS name netbsd* to "netbsd".
 
---- aclocal.m4.orig    2019-08-25 12:03:36.000000000 +0000
+--- aclocal.m4.orig    2020-01-12 06:28:01.000000000 +0000
 +++ aclocal.m4
-@@ -2044,6 +2044,9 @@ AC_DEFUN([GHC_CONVERT_OS],[
+@@ -985,8 +985,11 @@ else
+ fi;
+ changequote([, ])dnl
+ ])
+-FP_COMPARE_VERSIONS([$fptools_cv_alex_version],[-lt],[3.1.7],
+-  [AC_MSG_ERROR([Alex version 3.1.7 or later is required to compile GHC.])])[]
++if test ! -f compiler/parser/Lexer.hs
++then
++    FP_COMPARE_VERSIONS([$fptools_cv_alex_version],[-lt],[3.1.7],
++      [AC_MSG_ERROR([Alex version 3.1.7 or later is required to compile GHC.])])[]
++fi
+ AlexVersion=$fptools_cv_alex_version;
+ AC_SUBST(AlexVersion)
+ ])
+@@ -2044,6 +2047,9 @@ AC_DEFUN([GHC_CONVERT_OS],[
        openbsd*)
          $3="openbsd"
          ;;