commit fe42ec221f7969992bc726f1ed8be9f882bbde3c Author: Thierry Thomas Date: Tue Jul 27 21:44:25 2021 +0200 lang/ecl: upgrade to 21.2.1 Changelog at . PR: XXXXX Approved by: /* TODO */ diff --git a/lang/ecl/Makefile b/lang/ecl/Makefile index 9067fbeea697..c0488f49e595 100644 --- a/lang/ecl/Makefile +++ b/lang/ecl/Makefile @@ -1,8 +1,7 @@ # Created by: Julian Stecklina PORTNAME= ecl -PORTVERSION= 20.4.24 -PORTREVISION= 2 +PORTVERSION= 21.2.1 CATEGORIES= lang lisp MASTER_SITES= https://common-lisp.net/project/ecl/static/files/release/ diff --git a/lang/ecl/distinfo b/lang/ecl/distinfo index e50a29ca2f21..440270a85ee6 100644 --- a/lang/ecl/distinfo +++ b/lang/ecl/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1592221665 -SHA256 (ecl-20.4.24.tgz) = 670838edf258a936b522fdb620da336de7e575aa0d27e34841727252726d0f07 -SIZE (ecl-20.4.24.tgz) = 7815444 +TIMESTAMP = 1627310876 +SHA256 (ecl-21.2.1.tgz) = b15a75dcf84b8f62e68720ccab1393f9611c078fcd3afdd639a1086cad010900 +SIZE (ecl-21.2.1.tgz) = 7875088 diff --git a/lang/ecl/files/patch-75877dd.c b/lang/ecl/files/patch-75877dd.c deleted file mode 100644 index 6b77554cb666..000000000000 --- a/lang/ecl/files/patch-75877dd.c +++ /dev/null @@ -1,47 +0,0 @@ -From 75877dd8f0d534552284ba4380ba65baa74f028f Mon Sep 17 00:00:00 2001 -From: Marius Gerbershagen -Date: Sun, 28 Jun 2020 11:02:15 +0200 -Subject: [PATCH] fpe: fix ECL_WITH_LISP_FPE macro - -We can't use ecl_process_env_unsafe() == NULL to check if ECL has -booted because the return value of ecl_process_env_unsafe is -unpredictable before ECL has booted. The reason is that -ecl_process_env_unsafe calls pthread_getspecific with an uninitialized -key stored in cl_env_key. But another call to pthread_setspecific -might have already registered a key which happens to be the same as -the not yet initialized cl_env_key, yielding a non-NULL value. ---- - src/h/impl/math_fenv.h | 17 ++++++++--------- - 1 file changed, 8 insertions(+), 9 deletions(-) - -diff --git a/src/h/impl/math_fenv.h b/src/h/impl/math_fenv.h -index 0a93c8e0a..9630f4c6c 100644 ---- src/h/impl/math_fenv.h -+++ src/h/impl/math_fenv.h -@@ -72,15 +72,14 @@ - - #if defined(HAVE_FENV_H) && !defined(ECL_AVOID_FPE_H) - # if defined(HAVE_FEENABLEEXCEPT) --# define ECL_WITH_LISP_FPE_BEGIN do { \ -- fenv_t __fenv; \ -- fegetenv(&__fenv); \ -- cl_env_ptr __the_env = ecl_process_env_unsafe(); \ -- if (__the_env) { \ -- int bits = __the_env->trap_fpe_bits; \ -- fedisableexcept(FE_ALL_EXCEPT & ~bits); \ -- feenableexcept(FE_ALL_EXCEPT & bits); \ -- } \ -+# define ECL_WITH_LISP_FPE_BEGIN do { \ -+ fenv_t __fenv; \ -+ fegetenv(&__fenv); \ -+ if (ecl_get_option(ECL_OPT_BOOTED) > 0) { \ -+ int bits = ecl_process_env()->trap_fpe_bits; \ -+ fedisableexcept(FE_ALL_EXCEPT & ~bits); \ -+ feenableexcept(FE_ALL_EXCEPT & bits); \ -+ } \ - feclearexcept(FE_ALL_EXCEPT); - # else - # define ECL_WITH_LISP_FPE_BEGIN do { \ --- -GitLab - diff --git a/lang/ecl/pkg-plist b/lang/ecl/pkg-plist index 6f112ac1162b..bccf75020c03 100644 --- a/lang/ecl/pkg-plist +++ b/lang/ecl/pkg-plist @@ -224,8 +224,8 @@ lib/ecl-%%VERSION%%/serve-event.fas %%SOCKETS%%lib/ecl-%%VERSION%%/sockets.fas lib/libecl.so lib/libecl.so.%%VERSION%% -lib/libecl.so.20 -lib/libecl.so.20.4 +lib/libecl.so.21 +lib/libecl.so.21.2 man/man1/ecl-config.1.gz man/man1/ecl.1.gz @dir include/ecl/gc