From de07d93199e3e8d9c9d81777c72bb10d80772dfd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Tue, 24 Aug 2021 18:55:59 -0300 Subject: [PATCH] ecl: update to 21.2.1. --- srcpkgs/ecl/files/armv5tel-musl.conf | 6 +- srcpkgs/ecl/files/armv5tel.conf | 6 +- srcpkgs/ecl/files/armv6l-musl.conf | 6 +- srcpkgs/ecl/files/armv6l.conf | 6 +- srcpkgs/ecl/files/armv7l-musl.conf | 6 +- srcpkgs/ecl/files/armv7l.conf | 6 +- srcpkgs/ecl/files/mips-musl.conf | 6 +- srcpkgs/ecl/files/mipsel-musl.conf | 6 +- srcpkgs/ecl/files/mipselhf-musl.conf | 6 +- srcpkgs/ecl/files/mipshf-musl.conf | 6 +- srcpkgs/ecl/files/ppc-musl.conf | 6 +- srcpkgs/ecl/files/ppc.conf | 6 +- srcpkgs/ecl/files/ppc64-musl.conf | 2 +- srcpkgs/ecl/files/ppc64.conf | 2 +- srcpkgs/ecl/files/ppc64le-musl.conf | 2 +- srcpkgs/ecl/files/ppc64le.conf | 2 +- srcpkgs/ecl/patches/fix-libffi-system.patch | 16 ---- srcpkgs/ecl/patches/fix-math_fenv_h.patch | 99 --------------------- srcpkgs/ecl/template | 6 +- 19 files changed, 43 insertions(+), 158 deletions(-) delete mode 100644 srcpkgs/ecl/patches/fix-libffi-system.patch delete mode 100644 srcpkgs/ecl/patches/fix-math_fenv_h.patch diff --git a/srcpkgs/ecl/files/armv5tel-musl.conf b/srcpkgs/ecl/files/armv5tel-musl.conf index b633337b9ff7..dbebd3fbd9fa 100644 --- a/srcpkgs/ecl/files/armv5tel-musl.conf +++ b/srcpkgs/ecl/files/armv5tel-musl.conf @@ -41,12 +41,12 @@ ECL_STDINT_HEADER="#include " ECL_UINT8_T=uint8_t ECL_UINT16_T=uint16_t ECL_UINT32_T=uint32_t -ECL_UINT64_T=no +ECL_UINT64_T=uint64_t ECL_INT8_T=int8_t ECL_INT16_T=int16_t ECL_INT32_T=int32_t -ECL_INT64_T=no -ECL_LONG_LONG_BITS=no +ECL_INT64_T=int64_t +ECL_LONG_LONG_BITS=64 ### ### 1.7) Other features (set to 'no' to disable) diff --git a/srcpkgs/ecl/files/armv5tel.conf b/srcpkgs/ecl/files/armv5tel.conf index 6233550c94d9..c89dc32521b2 100644 --- a/srcpkgs/ecl/files/armv5tel.conf +++ b/srcpkgs/ecl/files/armv5tel.conf @@ -41,12 +41,12 @@ ECL_STDINT_HEADER="#include " ECL_UINT8_T=uint8_t ECL_UINT16_T=uint16_t ECL_UINT32_T=uint32_t -ECL_UINT64_T=no +ECL_UINT64_T=uint64_t ECL_INT8_T=int8_t ECL_INT16_T=int16_t ECL_INT32_T=int32_t -ECL_INT64_T=no -ECL_LONG_LONG_BITS=no +ECL_INT64_T=int64_t +ECL_LONG_LONG_BITS=64 ### ### 1.7) Other features (set to 'no' to disable) diff --git a/srcpkgs/ecl/files/armv6l-musl.conf b/srcpkgs/ecl/files/armv6l-musl.conf index a48cd8bd4d2f..34266b34418f 100644 --- a/srcpkgs/ecl/files/armv6l-musl.conf +++ b/srcpkgs/ecl/files/armv6l-musl.conf @@ -41,12 +41,12 @@ ECL_STDINT_HEADER="#include " ECL_UINT8_T=uint8_t ECL_UINT16_T=uint16_t ECL_UINT32_T=uint32_t -ECL_UINT64_T=no +ECL_UINT64_T=uint64_t ECL_INT8_T=int8_t ECL_INT16_T=int16_t ECL_INT32_T=int32_t -ECL_INT64_T=no -ECL_LONG_LONG_BITS=no +ECL_INT64_T=int64_t +ECL_LONG_LONG_BITS=64 ### ### 1.7) Other features (set to 'no' to disable) diff --git a/srcpkgs/ecl/files/armv6l.conf b/srcpkgs/ecl/files/armv6l.conf index a48cd8bd4d2f..34266b34418f 100644 --- a/srcpkgs/ecl/files/armv6l.conf +++ b/srcpkgs/ecl/files/armv6l.conf @@ -41,12 +41,12 @@ ECL_STDINT_HEADER="#include " ECL_UINT8_T=uint8_t ECL_UINT16_T=uint16_t ECL_UINT32_T=uint32_t -ECL_UINT64_T=no +ECL_UINT64_T=uint64_t ECL_INT8_T=int8_t ECL_INT16_T=int16_t ECL_INT32_T=int32_t -ECL_INT64_T=no -ECL_LONG_LONG_BITS=no +ECL_INT64_T=int64_t +ECL_LONG_LONG_BITS=64 ### ### 1.7) Other features (set to 'no' to disable) diff --git a/srcpkgs/ecl/files/armv7l-musl.conf b/srcpkgs/ecl/files/armv7l-musl.conf index c70a38d248a3..64a98428f693 100644 --- a/srcpkgs/ecl/files/armv7l-musl.conf +++ b/srcpkgs/ecl/files/armv7l-musl.conf @@ -41,12 +41,12 @@ ECL_STDINT_HEADER="#include " ECL_UINT8_T=uint8_t ECL_UINT16_T=uint16_t ECL_UINT32_T=uint32_t -ECL_UINT64_T=no +ECL_UINT64_T=uint64_t ECL_INT8_T=int8_t ECL_INT16_T=int16_t ECL_INT32_T=int32_t -ECL_INT64_T=no -ECL_LONG_LONG_BITS=no +ECL_INT64_T=int64_t +ECL_LONG_LONG_BITS=64 ### ### 1.7) Other features (set to 'no' to disable) diff --git a/srcpkgs/ecl/files/armv7l.conf b/srcpkgs/ecl/files/armv7l.conf index c70a38d248a3..64a98428f693 100644 --- a/srcpkgs/ecl/files/armv7l.conf +++ b/srcpkgs/ecl/files/armv7l.conf @@ -41,12 +41,12 @@ ECL_STDINT_HEADER="#include " ECL_UINT8_T=uint8_t ECL_UINT16_T=uint16_t ECL_UINT32_T=uint32_t -ECL_UINT64_T=no +ECL_UINT64_T=uint64_t ECL_INT8_T=int8_t ECL_INT16_T=int16_t ECL_INT32_T=int32_t -ECL_INT64_T=no -ECL_LONG_LONG_BITS=no +ECL_INT64_T=int64_t +ECL_LONG_LONG_BITS=64 ### ### 1.7) Other features (set to 'no' to disable) diff --git a/srcpkgs/ecl/files/mips-musl.conf b/srcpkgs/ecl/files/mips-musl.conf index 2198241b6ed7..dd18eb8e0e57 100644 --- a/srcpkgs/ecl/files/mips-musl.conf +++ b/srcpkgs/ecl/files/mips-musl.conf @@ -41,12 +41,12 @@ ECL_STDINT_HEADER="#include " ECL_UINT8_T=uint8_t ECL_UINT16_T=uint16_t ECL_UINT32_T=uint32_t -ECL_UINT64_T=no +ECL_UINT64_T=uint64_t ECL_INT8_T=int8_t ECL_INT16_T=int16_t ECL_INT32_T=int32_t -ECL_INT64_T=no -ECL_LONG_LONG_BITS=no +ECL_INT64_T=int64_t +ECL_LONG_LONG_BITS=64 ### ### 1.7) Other features (set to 'no' to disable) diff --git a/srcpkgs/ecl/files/mipsel-musl.conf b/srcpkgs/ecl/files/mipsel-musl.conf index 0b553b267032..c037e1a47891 100644 --- a/srcpkgs/ecl/files/mipsel-musl.conf +++ b/srcpkgs/ecl/files/mipsel-musl.conf @@ -41,12 +41,12 @@ ECL_STDINT_HEADER="#include " ECL_UINT8_T=uint8_t ECL_UINT16_T=uint16_t ECL_UINT32_T=uint32_t -ECL_UINT64_T=no +ECL_UINT64_T=uint64_t ECL_INT8_T=int8_t ECL_INT16_T=int16_t ECL_INT32_T=int32_t -ECL_INT64_T=no -ECL_LONG_LONG_BITS=no +ECL_INT64_T=int64_t +ECL_LONG_LONG_BITS=64 ### ### 1.7) Other features (set to 'no' to disable) diff --git a/srcpkgs/ecl/files/mipselhf-musl.conf b/srcpkgs/ecl/files/mipselhf-musl.conf index 0b553b267032..c037e1a47891 100644 --- a/srcpkgs/ecl/files/mipselhf-musl.conf +++ b/srcpkgs/ecl/files/mipselhf-musl.conf @@ -41,12 +41,12 @@ ECL_STDINT_HEADER="#include " ECL_UINT8_T=uint8_t ECL_UINT16_T=uint16_t ECL_UINT32_T=uint32_t -ECL_UINT64_T=no +ECL_UINT64_T=uint64_t ECL_INT8_T=int8_t ECL_INT16_T=int16_t ECL_INT32_T=int32_t -ECL_INT64_T=no -ECL_LONG_LONG_BITS=no +ECL_INT64_T=int64_t +ECL_LONG_LONG_BITS=64 ### ### 1.7) Other features (set to 'no' to disable) diff --git a/srcpkgs/ecl/files/mipshf-musl.conf b/srcpkgs/ecl/files/mipshf-musl.conf index 2198241b6ed7..dd18eb8e0e57 100644 --- a/srcpkgs/ecl/files/mipshf-musl.conf +++ b/srcpkgs/ecl/files/mipshf-musl.conf @@ -41,12 +41,12 @@ ECL_STDINT_HEADER="#include " ECL_UINT8_T=uint8_t ECL_UINT16_T=uint16_t ECL_UINT32_T=uint32_t -ECL_UINT64_T=no +ECL_UINT64_T=uint64_t ECL_INT8_T=int8_t ECL_INT16_T=int16_t ECL_INT32_T=int32_t -ECL_INT64_T=no -ECL_LONG_LONG_BITS=no +ECL_INT64_T=int64_t +ECL_LONG_LONG_BITS=64 ### ### 1.7) Other features (set to 'no' to disable) diff --git a/srcpkgs/ecl/files/ppc-musl.conf b/srcpkgs/ecl/files/ppc-musl.conf index cdca29e1d613..7e8722b67289 100644 --- a/srcpkgs/ecl/files/ppc-musl.conf +++ b/srcpkgs/ecl/files/ppc-musl.conf @@ -41,12 +41,12 @@ ECL_STDINT_HEADER="#include " ECL_UINT8_T=uint8_t ECL_UINT16_T=uint16_t ECL_UINT32_T=uint32_t -ECL_UINT64_T=no +ECL_UINT64_T=uint64_t ECL_INT8_T=int8_t ECL_INT16_T=int16_t ECL_INT32_T=int32_t -ECL_INT64_T=no -ECL_LONG_LONG_BITS=no +ECL_INT64_T=int64_t +ECL_LONG_LONG_BITS=64 ### ### 1.7) Other features (set to 'no' to disable) diff --git a/srcpkgs/ecl/files/ppc.conf b/srcpkgs/ecl/files/ppc.conf index 8c5c3d1bb4d3..0cbd381348c9 100644 --- a/srcpkgs/ecl/files/ppc.conf +++ b/srcpkgs/ecl/files/ppc.conf @@ -41,12 +41,12 @@ ECL_STDINT_HEADER="#include " ECL_UINT8_T=uint8_t ECL_UINT16_T=uint16_t ECL_UINT32_T=uint32_t -ECL_UINT64_T=no +ECL_UINT64_T=uint64_t ECL_INT8_T=int8_t ECL_INT16_T=int16_t ECL_INT32_T=int32_t -ECL_INT64_T=no -ECL_LONG_LONG_BITS=no +ECL_INT64_T=int64_t +ECL_LONG_LONG_BITS=64 ### ### 1.7) Other features (set to 'no' to disable) diff --git a/srcpkgs/ecl/files/ppc64-musl.conf b/srcpkgs/ecl/files/ppc64-musl.conf index d9aac8d11812..4e05d1b6fa92 100644 --- a/srcpkgs/ecl/files/ppc64-musl.conf +++ b/srcpkgs/ecl/files/ppc64-musl.conf @@ -46,7 +46,7 @@ ECL_INT8_T=int8_t ECL_INT16_T=int16_t ECL_INT32_T=int32_t ECL_INT64_T=int64_t -ECL_LONG_LONG_BITS=no +ECL_LONG_LONG_BITS=64 ### ### 1.7) Other features (set to 'no' to disable) diff --git a/srcpkgs/ecl/files/ppc64.conf b/srcpkgs/ecl/files/ppc64.conf index a47bab0ad9be..bacd65171fab 100644 --- a/srcpkgs/ecl/files/ppc64.conf +++ b/srcpkgs/ecl/files/ppc64.conf @@ -46,7 +46,7 @@ ECL_INT8_T=int8_t ECL_INT16_T=int16_t ECL_INT32_T=int32_t ECL_INT64_T=int64_t -ECL_LONG_LONG_BITS=no +ECL_LONG_LONG_BITS=64 ### ### 1.7) Other features (set to 'no' to disable) diff --git a/srcpkgs/ecl/files/ppc64le-musl.conf b/srcpkgs/ecl/files/ppc64le-musl.conf index 3a02a9ae3ffb..6c7ccff9523d 100644 --- a/srcpkgs/ecl/files/ppc64le-musl.conf +++ b/srcpkgs/ecl/files/ppc64le-musl.conf @@ -46,7 +46,7 @@ ECL_INT8_T=int8_t ECL_INT16_T=int16_t ECL_INT32_T=int32_t ECL_INT64_T=int64_t -ECL_LONG_LONG_BITS=no +ECL_LONG_LONG_BITS=64 ### ### 1.7) Other features (set to 'no' to disable) diff --git a/srcpkgs/ecl/files/ppc64le.conf b/srcpkgs/ecl/files/ppc64le.conf index 59b1ad44e998..49b52dadf990 100644 --- a/srcpkgs/ecl/files/ppc64le.conf +++ b/srcpkgs/ecl/files/ppc64le.conf @@ -46,7 +46,7 @@ ECL_INT8_T=int8_t ECL_INT16_T=int16_t ECL_INT32_T=int32_t ECL_INT64_T=int64_t -ECL_LONG_LONG_BITS=no +ECL_LONG_LONG_BITS=64 ### ### 1.7) Other features (set to 'no' to disable) diff --git a/srcpkgs/ecl/patches/fix-libffi-system.patch b/srcpkgs/ecl/patches/fix-libffi-system.patch deleted file mode 100644 index 224041426bc3..000000000000 --- a/srcpkgs/ecl/patches/fix-libffi-system.patch +++ /dev/null @@ -1,16 +0,0 @@ -Source: @pullmoll -Upstream: no -Reason: ffitarget.h no longer defines FFI_SYSV for *nix - ---- a/src/c/ffi.d 2016-12-19 11:25:00.000000000 +0100 -+++ b/src/c/ffi.d 2020-04-25 13:29:05.385149890 +0200 -@@ -133,8 +133,6 @@ - #elif defined(X86_WIN64) - {@':win64', FFI_WIN64}, --#elif defined(X86_ANY) || defined(X86) || defined(X86_64) -- {@':cdecl', FFI_SYSV}, -- {@':sysv', FFI_SYSV}, -+#elif defined(X86_64) - {@':unix64', FFI_UNIX64}, - #endif - }; diff --git a/srcpkgs/ecl/patches/fix-math_fenv_h.patch b/srcpkgs/ecl/patches/fix-math_fenv_h.patch deleted file mode 100644 index c48b835c8d32..000000000000 --- a/srcpkgs/ecl/patches/fix-math_fenv_h.patch +++ /dev/null @@ -1,99 +0,0 @@ -Source: @pullmoll -Upstream: no -Reason: Some architectures do not define all of the FE_.. constants - ---- a/src/h/impl/math_fenv.h 2016-12-19 11:25:00.000000000 +0100 -+++ b/src/h/impl/math_fenv.h 2020-04-25 15:36:04.984693324 +0200 -@@ -67,8 +67,27 @@ - #endif /* !HAVE_FENV_H */ - - #if defined(HAVE_FENV_H) && !defined(HAVE_FEENABLEEXCEPT) && !defined(ECL_AVOID_FPE_H) --# define ECL_USED_EXCEPTIONS (FE_DIVBYZERO|FE_INVALID|FE_OVERFLOW|FE_UNDERFLOW) --# define ECL_MATHERR_CLEAR feclearexcept(FE_ALL_EXCEPT) -+#if !defined(FE_DIVBYZERO) -+#define FE_DIVBYZERO 0 -+#endif -+#if !defined(FE_INVALID) -+#define FE_INVALID 0 -+#endif -+#if !defined(FE_OVERFLOW) -+#define FE_OVERFLOW 0 -+#endif -+#if !defined(FE_UNDERFLOW) -+#define FE_UNDERFLOW 0 -+#endif -+#if !defined(FE_INEXACT) -+#define FE_INEXACT 0 -+#endif -+#if !defined(FE_ALL_EXCEPT) -+#define FE_ALL_EXCEPT 0 -+#endif -+ -+# define ECL_USED_EXCEPTIONS (FE_DIVBYZERO|FE_INVALID|FE_OVERFLOW|FE_UNDERFLOW) -+# define ECL_MATHERR_CLEAR feclearexcept(FE_ALL_EXCEPT) - # define ECL_MATHERR_TEST do { \ - int bits = fetestexcept(ECL_USED_EXCEPTIONS); \ - unlikely_if (bits) ecl_deliver_fpe(bits); } while(0) ---- a/src/c/unixint.d 2016-12-19 11:25:00.000000000 +0100 -+++ b/src/c/unixint.d 2020-04-25 15:57:15.864783964 +0200 -@@ -655,22 +655,36 @@ - #else /* !_MSC_VER */ - # if defined(HAVE_FENV_H) & !defined(ECL_AVOID_FENV_H) - code = fetestexcept(FE_ALL_EXCEPT); -+#if defined(FE_DIVBYZERO) - if (code & FE_DIVBYZERO) { - condition = @'division-by-zero'; - code = FE_DIVBYZERO; -- } else if (code & FE_INVALID) { -+ } else -+#endif -+#if defined(FE_INVALID) -+ if (code & FE_INVALID) { - condition = @'floating-point-invalid-operation'; - code = FE_INVALID; -- } else if (code & FE_OVERFLOW) { -+ } else -+#endif -+#if defined(FE_OVERFLOW) -+ if (code & FE_OVERFLOW) { - condition = @'floating-point-overflow'; - code = FE_OVERFLOW; -- } else if (code & FE_UNDERFLOW) { -+ } else -+#endif -+#if defined(FE_UNDERFLOW) -+ if (code & FE_UNDERFLOW) { - condition = @'floating-point-underflow'; - code = FE_UNDERFLOW; -- } else if (code & FE_INEXACT) { -+ } else -+#endif -+#if defined(FE_INEXACT) -+ if (code & FE_INEXACT) { - condition = @'floating-point-inexact'; - code = FE_INEXACT; - } -+#endif - feclearexcept(FE_ALL_EXCEPT); - # endif - #endif /* !_MSC_VER */ -@@ -1160,7 +1174,19 @@ - { - cl_env_ptr the_env = ecl_process_env(); - #ifndef FE_ALL_EXCEPT -+#if !defined(FE_DIVBYZERO) -+#define FE_DIVBYZERO 0 -+#endif -+#if !defined(FE_OVERFLOW) -+#define FE_OVERFLOW 0 -+#endif -+#if !defined(FE_UNDERFLOW) -+#define FE_UNDERFLOW 0 -+#endif -+#if !defined(FE_INVALID) -+#define FE_INVALID 0 -+#endif - # define FE_ALL_EXCEPT FE_DIVBYZERO | FE_OVERFLOW | FE_UNDERFLOW | FE_INVALID - #endif - const int all = FE_ALL_EXCEPT; - int bits = 0; diff --git a/srcpkgs/ecl/template b/srcpkgs/ecl/template index a4e160c15bed..0ef3754a8425 100644 --- a/srcpkgs/ecl/template +++ b/srcpkgs/ecl/template @@ -1,7 +1,7 @@ # Template file for 'ecl' pkgname=ecl -version=16.1.3 -revision=2 +version=21.2.1 +revision=1 build_style=gnu-configure configure_args="--enable-gmp=system --enable-boehm=system --enable-libatomic=system --with-dffi=system" @@ -13,7 +13,7 @@ maintainer="Kyle Nusbaum " license="LGPL-2.1-or-later" homepage="https://common-lisp.net/project/ecl/" distfiles="https://common-lisp.net/project/ecl/static/files/release/ecl-${version}.tgz" -checksum=76a585c616e8fa83a6b7209325a309da5bc0ca68e0658f396f49955638111254 +checksum=b15a75dcf84b8f62e68720ccab1393f9611c078fcd3afdd639a1086cad010900 if [ "$CROSS_BUILD" ]; then # Depend on system ecl