From b57fc1fc487080804284db389f507ace08a136f1 Mon Sep 17 00:00:00 2001
From: Masanori Ogino <167209+omasanori@users.noreply.github.com>
Date: Thu, 22 Oct 2020 19:43:37 +0900
Subject: [PATCH] ecl: 16.1.3 -> 20.4.24, eql-git: fix build

Signed-off-by: Masanori Ogino <167209+omasanori@users.noreply.github.com>
---
 pkgs/development/compilers/ecl/default.nix        | 11 +++++------
 .../compilers/ecl/libffi-3.3-abi.patch            | 15 ---------------
 pkgs/development/compilers/eql/default.nix        |  3 +++
 3 files changed, 8 insertions(+), 21 deletions(-)
 delete mode 100644 pkgs/development/compilers/ecl/libffi-3.3-abi.patch

diff --git a/pkgs/development/compilers/ecl/default.nix b/pkgs/development/compilers/ecl/default.nix
index 65f6884cd558..0b37dcf64fcb 100644
--- a/pkgs/development/compilers/ecl/default.nix
+++ b/pkgs/development/compilers/ecl/default.nix
@@ -1,5 +1,6 @@
 {stdenv, fetchurl
 , libtool, autoconf, automake
+, texinfo
 , gmp, mpfr, libffi, makeWrapper
 , noUnicode ? false
 , gcc
@@ -10,14 +11,13 @@ let
   s = # Generated upstream information
   rec {
     baseName="ecl";
-    version="16.1.3";
+    version="20.4.24";
     name="${baseName}-${version}";
-    hash="0m0j24w5d5a9dwwqyrg0d35c0nys16ijb4r0nyk87yp82v38b9bn";
-    url="https://common-lisp.net/project/ecl/static/files/release/ecl-16.1.3.tgz";
-    sha256="0m0j24w5d5a9dwwqyrg0d35c0nys16ijb4r0nyk87yp82v38b9bn";
+    url="https://common-lisp.net/project/ecl/static/files/release/${name}.tgz";
+    sha256="01qgdmr54wkj854f69qdm9sybrvd6gd21dpx4askdaaqybnkh237";
   };
   buildInputs = [
-    libtool autoconf automake makeWrapper
+    libtool autoconf automake texinfo makeWrapper
   ];
   propagatedBuildInputs = [
     libffi gmp mpfr gcc
@@ -36,7 +36,6 @@ stdenv.mkDerivation {
   };
 
   patches = [
-    ./libffi-3.3-abi.patch
   ];
 
   configureFlags = [
diff --git a/pkgs/development/compilers/ecl/libffi-3.3-abi.patch b/pkgs/development/compilers/ecl/libffi-3.3-abi.patch
deleted file mode 100644
index 0a2b5f4dd568..000000000000
--- a/pkgs/development/compilers/ecl/libffi-3.3-abi.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/src/c/ffi.d b/src/c/ffi.d
-index 8174977a..caa69f39 100644
---- a/src/c/ffi.d
-+++ b/src/c/ffi.d
-@@ -133,8 +133,8 @@ static struct {
- #elif defined(X86_WIN64)
-   {@':win64', FFI_WIN64},
- #elif defined(X86_ANY) || defined(X86) || defined(X86_64)
--  {@':cdecl', FFI_SYSV},
--  {@':sysv', FFI_SYSV},
-+  {@':cdecl', FFI_UNIX64},
-+  {@':sysv', FFI_UNIX64},
-   {@':unix64', FFI_UNIX64},
- #endif
- };
diff --git a/pkgs/development/compilers/eql/default.nix b/pkgs/development/compilers/eql/default.nix
index aac619126896..ce42c1021154 100644
--- a/pkgs/development/compilers/eql/default.nix
+++ b/pkgs/development/compilers/eql/default.nix
@@ -15,6 +15,9 @@ stdenv.mkDerivation rec {
 
   postPatch = ''
     sed -re 's@[(]in-home "gui/.command-history"[)]@(concatenate '"'"'string (ext:getenv "HOME") "/.eql-gui-command-history")@' -i gui/gui.lisp
+
+    # cl_def_c_function was renamed to ecl_def_c_function in ECL 20.4.24.
+    find . -type f -exec sed -e 's/\scl_def_c_function(/ ecl_def_c_function(/' -i {} \;
   '';
 
   buildPhase = ''