Bug#933009: ghc: FTBFS on riscv64, debian/patches/risc-support.patch lost

[Aurelien Jarno]

Source: ghc
Version: 8.6.5+dfsg1-1
Severity: important
Tags: patch
User: debian-riscv at lists.debian.org
Usertags: riscv64

ghc fails to build on riscv64 with the following error:

| checking for gfind... no
| checking for find... /usr/bin/find
| checking for sort... /usr/bin/sort
| checking for GHC Git commit id... given 92b6a0237e0195cee4773de4b237951addd659d9
| checking version of ghc... 8.4.4
| checking build system type... riscv64-unknown-linux-gnu
| checking host system type... riscv64-unknown-linux-gnu
| checking target system type... riscv64-unknown-linux-gnu
| Unknown CPU riscv64

The full build log is available there:
https://buildd.debian.org/status/fetch.php?pkg=ghc&arch=riscv64&ver=8.6.5%2Bdfsg1-1&stamp=1564007171&raw=0

In version 8.4.4+dfsg1-3 the aclocal.m4 file was patched to add support
for riscv64. This patch has been lost in version 8.6.5+dfsg1-1. Please
find attached the patch rebased onto the new version. It would be nice
if you can include it in the next upload.

Thanks,
Aurelien
-------------- next part --------------
Description: cherry-pick of upstream commits
 beba89a0f16681c85d39fc8a894bde4162ff492a.patch:
 5e63a25249f3cb07300258e115af9ff55079d2ea.patch:
Last-Update: 2019-05-27

Index: b/aclocal.m4
===================================================================
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -217,7 +217,7 @@ AC_DEFUN([FPTOOLS_SET_HASKELL_PLATFORM_V
         mipsel)
             test -z "[$]2" || eval "[$]2=ArchMipsel"
             ;;
-        hppa|hppa1_1|ia64|m68k|nios2|rs6000|s390|s390x|sh4|vax)
+        hppa|hppa1_1|ia64|m68k|nios2|riscv32|riscv64|rs6000|s390|s390x|sh4|vax)
             test -z "[$]2" || eval "[$]2=ArchUnknown"
             ;;
         *)
@@ -1906,6 +1906,12 @@ case "$1" in
   powerpc*)
     $2="powerpc"
     ;;
+  riscv64*)
+    $2="riscv64"
+    ;;
+  riscv|riscv32*)
+    $2="riscv32"
+    ;;
   rs6000)
     $2="rs6000"
     ;;