Tue Feb 9 12:41:32 2021 UTC ()
ghc84: Fix build with autoconf-2.71. _AC_PROG_CC_C99 was removed


(ryoon)
diff -r1.5 -r1.6 pkgsrc/lang/ghc84/distinfo
diff -r1.1 -r1.2 pkgsrc/lang/ghc84/patches/patch-aclocal.m4
cvs diff -r1.5 -r1.6 pkgsrc/lang/ghc84/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/ghc84/distinfo 2020/02/17 17:24:06 1.5
+++ pkgsrc/lang/ghc84/distinfo 2021/02/09 12:41:32 1.6
@@ -1,39 +1,39 @@ @@ -1,39 +1,39 @@
1$NetBSD: distinfo,v 1.5 2020/02/17 17:24:06 jperkin Exp $ 1$NetBSD: distinfo,v 1.6 2021/02/09 12:41:32 ryoon Exp $
2 2
3SHA1 (ghc-8.0.2-boot-x86_64-unknown-solaris2.tar.xz) = 517ea9435af0c8b4f32899ae3bd26ff8da34f180 3SHA1 (ghc-8.0.2-boot-x86_64-unknown-solaris2.tar.xz) = 517ea9435af0c8b4f32899ae3bd26ff8da34f180
4RMD160 (ghc-8.0.2-boot-x86_64-unknown-solaris2.tar.xz) = c88b0958085ce9a6e1b175280d536986e4c712b1 4RMD160 (ghc-8.0.2-boot-x86_64-unknown-solaris2.tar.xz) = c88b0958085ce9a6e1b175280d536986e4c712b1
5SHA512 (ghc-8.0.2-boot-x86_64-unknown-solaris2.tar.xz) = 9a58d74a4e4256caf4b2ecd09f6f96156e5d4d242ed83d906d114a0cb1fc86277384dfb966dd3a7fdbbf9a18d0abca05e4633637f1ba1afbdc30623793aa8b22 5SHA512 (ghc-8.0.2-boot-x86_64-unknown-solaris2.tar.xz) = 9a58d74a4e4256caf4b2ecd09f6f96156e5d4d242ed83d906d114a0cb1fc86277384dfb966dd3a7fdbbf9a18d0abca05e4633637f1ba1afbdc30623793aa8b22
6Size (ghc-8.0.2-boot-x86_64-unknown-solaris2.tar.xz) = 71752772 bytes 6Size (ghc-8.0.2-boot-x86_64-unknown-solaris2.tar.xz) = 71752772 bytes
7SHA1 (ghc-8.4.4-boot-i386-unknown-freebsd.tar.xz) = 04981802730423aa12999e59679be198d540222a 7SHA1 (ghc-8.4.4-boot-i386-unknown-freebsd.tar.xz) = 04981802730423aa12999e59679be198d540222a
8RMD160 (ghc-8.4.4-boot-i386-unknown-freebsd.tar.xz) = f617e67f2c2f07c7211cb391a4bc2e7b304045e2 8RMD160 (ghc-8.4.4-boot-i386-unknown-freebsd.tar.xz) = f617e67f2c2f07c7211cb391a4bc2e7b304045e2
9SHA512 (ghc-8.4.4-boot-i386-unknown-freebsd.tar.xz) = 0819d9d9cd73688c143812c703e8394c9010e9e81c03a69c81f6bcc784f262ec04bffb9d8f2d030209f2f1a05ccddfb46c36fe789936e2b850920bf08052448f 9SHA512 (ghc-8.4.4-boot-i386-unknown-freebsd.tar.xz) = 0819d9d9cd73688c143812c703e8394c9010e9e81c03a69c81f6bcc784f262ec04bffb9d8f2d030209f2f1a05ccddfb46c36fe789936e2b850920bf08052448f
10Size (ghc-8.4.4-boot-i386-unknown-freebsd.tar.xz) = 52125656 bytes 10Size (ghc-8.4.4-boot-i386-unknown-freebsd.tar.xz) = 52125656 bytes
11SHA1 (ghc-8.4.4-boot-x86_64-apple-darwin.tar.xz) = 688f5729992bd2476699d9067d97e79b06bdec60 11SHA1 (ghc-8.4.4-boot-x86_64-apple-darwin.tar.xz) = 688f5729992bd2476699d9067d97e79b06bdec60
12RMD160 (ghc-8.4.4-boot-x86_64-apple-darwin.tar.xz) = 4e9c52c8ef07343cc24528e3f8431754237d0be3 12RMD160 (ghc-8.4.4-boot-x86_64-apple-darwin.tar.xz) = 4e9c52c8ef07343cc24528e3f8431754237d0be3
13SHA512 (ghc-8.4.4-boot-x86_64-apple-darwin.tar.xz) = abc92ca6822ba7fe2d09bc381a833c0cbd5f436b517fba003736195cec45f8ce2e33623a587ad35f5702baac791594d62fc829e2ea4dfceae2455875661b3ba6 13SHA512 (ghc-8.4.4-boot-x86_64-apple-darwin.tar.xz) = abc92ca6822ba7fe2d09bc381a833c0cbd5f436b517fba003736195cec45f8ce2e33623a587ad35f5702baac791594d62fc829e2ea4dfceae2455875661b3ba6
14Size (ghc-8.4.4-boot-x86_64-apple-darwin.tar.xz) = 51700444 bytes 14Size (ghc-8.4.4-boot-x86_64-apple-darwin.tar.xz) = 51700444 bytes
15SHA1 (ghc-8.4.4-boot-x86_64-unknown-freebsd.tar.xz) = e16fcc19bc76eed3de81dd14064fd427d4f04c93 15SHA1 (ghc-8.4.4-boot-x86_64-unknown-freebsd.tar.xz) = e16fcc19bc76eed3de81dd14064fd427d4f04c93
16RMD160 (ghc-8.4.4-boot-x86_64-unknown-freebsd.tar.xz) = 5e6eb0ca293c96dd7fa33e3ab8dc3541e2e2f441 16RMD160 (ghc-8.4.4-boot-x86_64-unknown-freebsd.tar.xz) = 5e6eb0ca293c96dd7fa33e3ab8dc3541e2e2f441
17SHA512 (ghc-8.4.4-boot-x86_64-unknown-freebsd.tar.xz) = 2eccb6c0a64d505363cb340e9a603c744c48c59202a00f4c535ba0b278908fe58c126d7bfc3ae233ec097febfa3c395c3622a4cb4270b85af5189f2ceeda664a 17SHA512 (ghc-8.4.4-boot-x86_64-unknown-freebsd.tar.xz) = 2eccb6c0a64d505363cb340e9a603c744c48c59202a00f4c535ba0b278908fe58c126d7bfc3ae233ec097febfa3c395c3622a4cb4270b85af5189f2ceeda664a
18Size (ghc-8.4.4-boot-x86_64-unknown-freebsd.tar.xz) = 53872384 bytes 18Size (ghc-8.4.4-boot-x86_64-unknown-freebsd.tar.xz) = 53872384 bytes
19SHA1 (ghc-8.4.4-boot-x86_64-unknown-netbsd.tar.xz) = bc7b0e203a6e7e6804c4be46957352d032cd22ec 19SHA1 (ghc-8.4.4-boot-x86_64-unknown-netbsd.tar.xz) = bc7b0e203a6e7e6804c4be46957352d032cd22ec
20RMD160 (ghc-8.4.4-boot-x86_64-unknown-netbsd.tar.xz) = dd50835c50cd2102c1af4d2ed8f1148c8ac4d4d9 20RMD160 (ghc-8.4.4-boot-x86_64-unknown-netbsd.tar.xz) = dd50835c50cd2102c1af4d2ed8f1148c8ac4d4d9
21SHA512 (ghc-8.4.4-boot-x86_64-unknown-netbsd.tar.xz) = 0cc836390985c56d79a5c08dd2117c53fc9802b969db408dab14cfd441d95b2b5c18fed5d0b6da8a8555501e668ba471d0b878ea11a0021fba76265ed4ef8f76 21SHA512 (ghc-8.4.4-boot-x86_64-unknown-netbsd.tar.xz) = 0cc836390985c56d79a5c08dd2117c53fc9802b969db408dab14cfd441d95b2b5c18fed5d0b6da8a8555501e668ba471d0b878ea11a0021fba76265ed4ef8f76
22Size (ghc-8.4.4-boot-x86_64-unknown-netbsd.tar.xz) = 53040892 bytes 22Size (ghc-8.4.4-boot-x86_64-unknown-netbsd.tar.xz) = 53040892 bytes
23SHA1 (ghc-8.4.4-src.tar.xz) = bf8f807348c8a64469e42ecf9c4b71108f185c2c 23SHA1 (ghc-8.4.4-src.tar.xz) = bf8f807348c8a64469e42ecf9c4b71108f185c2c
24RMD160 (ghc-8.4.4-src.tar.xz) = d2be33c4b38ee0660fe081e625ad5242c819392c 24RMD160 (ghc-8.4.4-src.tar.xz) = d2be33c4b38ee0660fe081e625ad5242c819392c
25SHA512 (ghc-8.4.4-src.tar.xz) = 685e102eee8cf8b6a377afd7871998c8c368a5da288469367e3fb804aa6109e6f59be5945b8cd3d1e36c851190ea9a7f74c576528589589313d237b721d86da5 25SHA512 (ghc-8.4.4-src.tar.xz) = 685e102eee8cf8b6a377afd7871998c8c368a5da288469367e3fb804aa6109e6f59be5945b8cd3d1e36c851190ea9a7f74c576528589589313d237b721d86da5
26Size (ghc-8.4.4-src.tar.xz) = 11319500 bytes 26Size (ghc-8.4.4-src.tar.xz) = 11319500 bytes
27SHA1 (patch-aclocal.m4) = 848cf4e1fdc8ccd066f5edca1eeef27182d13312 27SHA1 (patch-aclocal.m4) = cb444acc956f46657070f9f6dc343008b35594bd
28SHA1 (patch-configure.ac) = dae98e76c51fdc2f70a77adf7d206c3d79c6bca6 28SHA1 (patch-configure.ac) = dae98e76c51fdc2f70a77adf7d206c3d79c6bca6
29SHA1 (patch-libraries_base_GHC_Event_KQueue.hsc) = 8ee5da667a241a05fde3c580d3dc9bdc05aa5f00 29SHA1 (patch-libraries_base_GHC_Event_KQueue.hsc) = 8ee5da667a241a05fde3c580d3dc9bdc05aa5f00
30SHA1 (patch-libraries_base_System_CPUTime_Posix_Times.hsc) = 2bfb779d534d12073287274ce5e90b99e457a860 30SHA1 (patch-libraries_base_System_CPUTime_Posix_Times.hsc) = 2bfb779d534d12073287274ce5e90b99e457a860
31SHA1 (patch-libraries_base_System_Environment.hs) = 7d79a91f295915b4408d5f41d5405739d7189215 31SHA1 (patch-libraries_base_System_Environment.hs) = 7d79a91f295915b4408d5f41d5405739d7189215
32SHA1 (patch-libraries_time_lib_Data_Time_Clock_Internal_CTimespec.hsc) = 588270767f8a9cbde0648fc99807891fef65d721 32SHA1 (patch-libraries_time_lib_Data_Time_Clock_Internal_CTimespec.hsc) = 588270767f8a9cbde0648fc99807891fef65d721
33SHA1 (patch-libraries_time_lib_Data_Time_Clock_Internal_CTimeval.hs) = b2811ec4a845e6b2b44414e940b6108178b597c5 33SHA1 (patch-libraries_time_lib_Data_Time_Clock_Internal_CTimeval.hs) = b2811ec4a845e6b2b44414e940b6108178b597c5
34SHA1 (patch-libraries_unix_System_Posix_Env.hsc) = e94936c139ca15d45cac4a7feb74a601567913ab 34SHA1 (patch-libraries_unix_System_Posix_Env.hsc) = e94936c139ca15d45cac4a7feb74a601567913ab
35SHA1 (patch-libraries_unix_System_Posix_Env_ByteString.hsc) = 3f675fc5d6bf5cc59a2d5ccffeb9ccd51521645a 35SHA1 (patch-libraries_unix_System_Posix_Env_ByteString.hsc) = 3f675fc5d6bf5cc59a2d5ccffeb9ccd51521645a
36SHA1 (patch-libraries_unix_System_Posix_Files_Common.hsc) = 6efef280832d376915a8987e4e8aac283408f607 36SHA1 (patch-libraries_unix_System_Posix_Files_Common.hsc) = 6efef280832d376915a8987e4e8aac283408f607
37SHA1 (patch-libraries_unix_System_Posix_Signals.hsc) = 49215dce493a6bbc440f91a3959e592f86fc779b 37SHA1 (patch-libraries_unix_System_Posix_Signals.hsc) = 49215dce493a6bbc440f91a3959e592f86fc779b
38SHA1 (patch-libraries_unix_include_execvpe.h) = 67dd9720a71a6a55bbe2b50e61621ca60187ef00 38SHA1 (patch-libraries_unix_include_execvpe.h) = 67dd9720a71a6a55bbe2b50e61621ca60187ef00
39SHA1 (patch-rules_distdir-way-opts.mk) = 7fc9e3111377680f698ec8877b91e98f7cdcdbb9 39SHA1 (patch-rules_distdir-way-opts.mk) = 7fc9e3111377680f698ec8877b91e98f7cdcdbb9
cvs diff -r1.1 -r1.2 pkgsrc/lang/ghc84/patches/patch-aclocal.m4 (expand / switch to unified diff)

--- pkgsrc/lang/ghc84/patches/patch-aclocal.m4 2020/01/07 16:52:09 1.1
+++ pkgsrc/lang/ghc84/patches/patch-aclocal.m4 2021/02/09 12:41:32 1.2
@@ -1,16 +1,36 @@ @@ -1,16 +1,36 @@
1$NetBSD: patch-aclocal.m4,v 1.1 2020/01/07 16:52:09 pho Exp $ 1$NetBSD: patch-aclocal.m4,v 1.2 2021/02/09 12:41:32 ryoon Exp $
 2
 3Fix build with autoconf-2.71. _AC_PROG_CC_C99 was removed.
2 4
3Canonicalize OS name netbsd* to "netbsd". 5Canonicalize OS name netbsd* to "netbsd".
4 6
5--- aclocal.m4.orig 2020-01-04 06:53:44.706301052 +0000 7--- aclocal.m4.orig 2018-03-25 19:22:32.000000000 +0000
6+++ aclocal.m4 8+++ aclocal.m4
7@@ -1981,6 +1981,9 @@ AC_DEFUN([GHC_CONVERT_OS],[ 9@@ -580,17 +580,6 @@ AC_DEFUN([FP_SET_CFLAGS_C99],
 10 CC="$$1"
 11 CFLAGS="$$2"
 12 CPPFLAGS="$$3"
 13- unset ac_cv_prog_cc_c99
 14- dnl perform detection
 15- _AC_PROG_CC_C99
 16- fp_cc_c99="$ac_cv_prog_cc_c99"
 17- case "x$ac_cv_prog_cc_c99" in
 18- x) ;; # noop
 19- xno) AC_MSG_ERROR([C99-compatible compiler needed]) ;;
 20- *) $2="$$2 $ac_cv_prog_cc_c99"
 21- $3="$$3 $ac_cv_prog_cc_c99"
 22- ;;
 23- esac
 24 dnl restore saved state
 25 FP_COPY_SHELLVAR([fp_save_CC],[CC])
 26 FP_COPY_SHELLVAR([fp_save_CFLAGS],[CFLAGS])
 27@@ -1981,6 +1970,9 @@ AC_DEFUN([GHC_CONVERT_OS],[
8 openbsd*) 28 openbsd*)
9 $3="openbsd" 29 $3="openbsd"
10 ;; 30 ;;
11+ netbsd*) 31+ netbsd*)
12+ $3="netbsd" 32+ $3="netbsd"
13+ ;; 33+ ;;
14 # As far as I'm aware, none of these have relevant variants 34 # As far as I'm aware, none of these have relevant variants
15 freebsd|netbsd|dragonfly|hpux|linuxaout|kfreebsdgnu|freebsd2|mingw32|darwin|gnu|nextstep2|nextstep3|sunos4|ultrix|haiku) 35 freebsd|netbsd|dragonfly|hpux|linuxaout|kfreebsdgnu|freebsd2|mingw32|darwin|gnu|nextstep2|nextstep3|sunos4|ultrix|haiku)
16 $3="$1" 36 $3="$1"