CVS commit: pkgsrc/lang/ghc88

["Ryo ONODERA" <ryoon%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Tue Feb  9 12:42:08 UTC 2021

Modified Files:
        pkgsrc/lang/ghc88: distinfo
        pkgsrc/lang/ghc88/patches: patch-aclocal.m4

Log Message:
ghc88: Fix build with autoconf-2.71. _AC_PROG_CC_C99 was removed


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 pkgsrc/lang/ghc88/distinfo
cvs rdiff -u -r1.5 -r1.6 pkgsrc/lang/ghc88/patches/patch-aclocal.m4

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/ghc88/distinfo
diff -u pkgsrc/lang/ghc88/distinfo:1.13 pkgsrc/lang/ghc88/distinfo:1.14
--- pkgsrc/lang/ghc88/distinfo:1.13     Wed Sep 16 17:26:31 2020
+++ pkgsrc/lang/ghc88/distinfo  Tue Feb  9 12:42:08 2021
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.13 2020/09/16 17:26:31 jperkin Exp $
+$NetBSD: distinfo,v 1.14 2021/02/09 12:42:08 ryoon Exp $
 
 SHA1 (ghc-8.4.4-boot-i386-unknown-freebsd.tar.xz) = 04981802730423aa12999e59679be198d540222a
 RMD160 (ghc-8.4.4-boot-i386-unknown-freebsd.tar.xz) = f617e67f2c2f07c7211cb391a4bc2e7b304045e2
@@ -24,7 +24,7 @@ SHA1 (ghc-8.8.4-src.tar.xz) = 94dfb44d8f
 RMD160 (ghc-8.8.4-src.tar.xz) = 2201ffb27231d9fce293b77830e6fae09f48f163
 SHA512 (ghc-8.8.4-src.tar.xz) = efd23bd819f7429486696a3a929a040471db7ea8a2d1f1d832e4cf0825b9e1e0c5e6ecad0ab8376f58b74e9c28c1d2f773bd126596d6d853c9e57d57e5ceb090
 Size (ghc-8.8.4-src.tar.xz) = 19395252 bytes
-SHA1 (patch-aclocal.m4) = 27209100d99fa8e2c4bc45d1423ead48de7626cb
+SHA1 (patch-aclocal.m4) = 16ac8899a7d87cf93a6139edba9e5222eb4c5c66
 SHA1 (patch-compiler_main_DynFlags.hs) = 07bb2a5afdd087f4d2da5c035feecc13273aec70
 SHA1 (patch-configure.ac) = 6e5cec26e440ccd71343a1981b415459813f88be
 SHA1 (patch-ghc_ghc.mk) = 9c639cc95cb79e4ffbd9b5fce311edba54939b5e

Index: pkgsrc/lang/ghc88/patches/patch-aclocal.m4
diff -u pkgsrc/lang/ghc88/patches/patch-aclocal.m4:1.5 pkgsrc/lang/ghc88/patches/patch-aclocal.m4:1.6
--- pkgsrc/lang/ghc88/patches/patch-aclocal.m4:1.5      Mon Aug 24 17:23:12 2020
+++ pkgsrc/lang/ghc88/patches/patch-aclocal.m4  Tue Feb  9 12:42:08 2021
@@ -1,15 +1,37 @@
-$NetBSD: patch-aclocal.m4,v 1.5 2020/08/24 17:23:12 pho Exp $
+$NetBSD: patch-aclocal.m4,v 1.6 2021/02/09 12:42:08 ryoon Exp $
 
 Hunk #1:
-  Support SunOS/x86_64.
+  Remove _AC_PROG_CC_C99 macro that is removed in autoconf-2.71
+  to fix build failure.
 
 Hunk #2:
+  Support SunOS/x86_64.
+
+Hunk #3:
   Canonicalize OS name netbsd* to "netbsd":
   https://gitlab.haskell.org/ghc/ghc/merge_requests/2496
 
 --- aclocal.m4.orig    2020-07-08 16:43:03.000000000 +0000
 +++ aclocal.m4
-@@ -661,7 +661,7 @@ AC_DEFUN([FPTOOLS_SET_C_LD_FLAGS],
+@@ -611,17 +611,6 @@ AC_DEFUN([FP_SET_CFLAGS_C99],
+     CC="$$1"
+     CFLAGS="$$2"
+     CPPFLAGS="$$3"
+-    unset ac_cv_prog_cc_c99
+-    dnl perform detection
+-    _AC_PROG_CC_C99
+-    fp_cc_c99="$ac_cv_prog_cc_c99"
+-    case "x$ac_cv_prog_cc_c99" in
+-      x)   ;; # noop
+-      xno) AC_MSG_ERROR([C99-compatible compiler needed]) ;;
+-      *)   $2="$$2 $ac_cv_prog_cc_c99"
+-           $3="$$3 $ac_cv_prog_cc_c99"
+-           ;;
+-    esac
+     dnl restore saved state
+     FP_COPY_SHELLVAR([fp_save_CC],[CC])
+     FP_COPY_SHELLVAR([fp_save_CFLAGS],[CFLAGS])
+@@ -661,7 +650,7 @@ AC_DEFUN([FPTOOLS_SET_C_LD_FLAGS],
      x86_64-unknown-solaris2)
          $2="$$2 -m64"
          $3="$$3 -m64"
@@ -18,7 +40,7 @@ Hunk #2:
          $5="$$5 -m64"
          ;;
      alpha-*)
-@@ -2047,6 +2047,9 @@ AC_DEFUN([GHC_CONVERT_OS],[
+@@ -2047,6 +2036,9 @@ AC_DEFUN([GHC_CONVERT_OS],[
        openbsd*)
          $3="openbsd"
          ;;