Merge pull request #39380 from timokau/ecl-error-handling

ecl_16_1_2: Adopt upstream error handling patch
This commit is contained in:
Michael Raskin 2018-04-23 19:57:14 +00:00 committed by GitHub
commit 7c3501724a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 2 deletions

View file

@ -1,9 +1,9 @@
{stdenv, fetchurl
{ stdenv, fetchurl, fetchpatch
, libtool, autoconf, automake
, gmp, mpfr, libffi, makeWrapper
, noUnicode ? false
, gcc
, threadSupport ? true
, threadSupport ? false
}:
let
s = # Generated upstream information
@ -39,6 +39,15 @@ stdenv.mkDerivation {
"--enable-unicode")
;
patches = [
(fetchpatch {
# Avoid infinite loop, see https://gitlab.com/embeddable-common-lisp/ecl/issues/43 (fixed upstream)
name = "avoid-infinite-loop.patch";
url = "https://gitlab.com/embeddable-common-lisp/ecl/commit/caba1989f40ef917e7486f41b9cd5c7e3c5c2d79.patch";
sha256 = "07vw91psbc9gdn8grql46ra8lq3bgkzg5v480chnbryna4sv6lbb";
})
];
hardeningDisable = [ "format" ];
postInstall = ''

View file

@ -53,6 +53,7 @@ stdenv.mkDerivation {
meta = {
inherit (s) version;
description = "Lisp implementation aiming to be small, fast and easy to embed";
homepage = https://common-lisp.net/project/ecl/;
license = stdenv.lib.licenses.mit ;
maintainers = [stdenv.lib.maintainers.raskin];
platforms = stdenv.lib.platforms.linux;