diff options
| author | ryoon <ryoon@pkgsrc.org> | 2021-02-09 12:41:32 +0000 |
|---|---|---|
| committer | ryoon <ryoon@pkgsrc.org> | 2021-02-09 12:41:32 +0000 |
| commit | 6002bdc76dfcdbb91d263488fdc214b4e768781f (patch) | |
| tree | 3e9009757cb6188e42a11b8bf07c48a71da943d2 /lang | |
| parent | b88c390cecee6f99437f53867dfa5b47396d33f9 (diff) | |
| download | pkgsrc-6002bdc76dfcdbb91d263488fdc214b4e768781f.tar.gz | |
ghc84: Fix build with autoconf-2.71. _AC_PROG_CC_C99 was removed
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/ghc84/distinfo | 4 | ||||
| -rw-r--r-- | lang/ghc84/patches/patch-aclocal.m4 | 26 |
2 files changed, 25 insertions, 5 deletions
diff --git a/lang/ghc84/distinfo b/lang/ghc84/distinfo index ed008a4856a..8e96fcb9a79 100644 --- a/lang/ghc84/distinfo +++ b/lang/ghc84/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.5 2020/02/17 17:24:06 jperkin Exp $ +$NetBSD: distinfo,v 1.6 2021/02/09 12:41:32 ryoon Exp $ SHA1 (ghc-8.0.2-boot-x86_64-unknown-solaris2.tar.xz) = 517ea9435af0c8b4f32899ae3bd26ff8da34f180 RMD160 (ghc-8.0.2-boot-x86_64-unknown-solaris2.tar.xz) = c88b0958085ce9a6e1b175280d536986e4c712b1 @@ -24,7 +24,7 @@ SHA1 (ghc-8.4.4-src.tar.xz) = bf8f807348c8a64469e42ecf9c4b71108f185c2c RMD160 (ghc-8.4.4-src.tar.xz) = d2be33c4b38ee0660fe081e625ad5242c819392c SHA512 (ghc-8.4.4-src.tar.xz) = 685e102eee8cf8b6a377afd7871998c8c368a5da288469367e3fb804aa6109e6f59be5945b8cd3d1e36c851190ea9a7f74c576528589589313d237b721d86da5 Size (ghc-8.4.4-src.tar.xz) = 11319500 bytes -SHA1 (patch-aclocal.m4) = 848cf4e1fdc8ccd066f5edca1eeef27182d13312 +SHA1 (patch-aclocal.m4) = cb444acc956f46657070f9f6dc343008b35594bd SHA1 (patch-configure.ac) = dae98e76c51fdc2f70a77adf7d206c3d79c6bca6 SHA1 (patch-libraries_base_GHC_Event_KQueue.hsc) = 8ee5da667a241a05fde3c580d3dc9bdc05aa5f00 SHA1 (patch-libraries_base_System_CPUTime_Posix_Times.hsc) = 2bfb779d534d12073287274ce5e90b99e457a860 diff --git a/lang/ghc84/patches/patch-aclocal.m4 b/lang/ghc84/patches/patch-aclocal.m4 index cc3994c7b74..d2004723cad 100644 --- a/lang/ghc84/patches/patch-aclocal.m4 +++ b/lang/ghc84/patches/patch-aclocal.m4 @@ -1,10 +1,30 @@ -$NetBSD: patch-aclocal.m4,v 1.1 2020/01/07 16:52:09 pho Exp $ +$NetBSD: patch-aclocal.m4,v 1.2 2021/02/09 12:41:32 ryoon Exp $ + +Fix build with autoconf-2.71. _AC_PROG_CC_C99 was removed. Canonicalize OS name netbsd* to "netbsd". ---- aclocal.m4.orig 2020-01-04 06:53:44.706301052 +0000 +--- aclocal.m4.orig 2018-03-25 19:22:32.000000000 +0000 +++ aclocal.m4 -@@ -1981,6 +1981,9 @@ AC_DEFUN([GHC_CONVERT_OS],[ +@@ -580,17 +580,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]) +@@ -1981,6 +1970,9 @@ AC_DEFUN([GHC_CONVERT_OS],[ openbsd*) $3="openbsd" ;; |