Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] ecl: update to 21.2.1.
@ 2021-08-24 23:33 tornaria
  2021-08-25  7:36 ` dkwo
                   ` (20 more replies)
  0 siblings, 21 replies; 22+ messages in thread
From: tornaria @ 2021-08-24 23:33 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 403 bytes --]

There is a new pull request by tornaria against master on the void-packages repository

https://github.com/tornaria/void-packages ecl
https://github.com/void-linux/void-packages/pull/32659

ecl: update to 21.2.1.
I compiled and doctested sage-9.4 with this PR + other updates and new packages. All working fine.

A patch file from https://github.com/void-linux/void-packages/pull/32659.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ecl-32659.patch --]
[-- Type: text/x-diff, Size: 5515 bytes --]

From 947014aa5f6ab7eebacd21abfe750d76cda0cd9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 24 Aug 2021 18:55:59 -0300
Subject: [PATCH] ecl: update to 21.2.1.

---
 srcpkgs/ecl/patches/fix-libffi-system.patch | 16 ----
 srcpkgs/ecl/patches/fix-math_fenv_h.patch   | 99 ---------------------
 srcpkgs/ecl/template                        |  6 +-
 3 files changed, 3 insertions(+), 118 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/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 <knusbaum+void@sdf.org>"
 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

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: ecl: update to 21.2.1.
  2021-08-24 23:33 [PR PATCH] ecl: update to 21.2.1 tornaria
@ 2021-08-25  7:36 ` dkwo
  2021-08-25 13:00 ` tornaria
                   ` (19 subsequent siblings)
  20 siblings, 0 replies; 22+ messages in thread
From: dkwo @ 2021-08-25  7:36 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 196 bytes --]

New comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/32659#issuecomment-905258810

Comment:
You read my mind :)
Should we keep fix-math_fenv_h patch?

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: ecl: update to 21.2.1.
  2021-08-24 23:33 [PR PATCH] ecl: update to 21.2.1 tornaria
  2021-08-25  7:36 ` dkwo
@ 2021-08-25 13:00 ` tornaria
  2021-08-25 13:02 ` [PR PATCH] [Updated] " tornaria
                   ` (18 subsequent siblings)
  20 siblings, 0 replies; 22+ messages in thread
From: tornaria @ 2021-08-25 13:00 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1437 bytes --]

New comment by tornaria on void-packages repository

https://github.com/void-linux/void-packages/pull/32659#issuecomment-905480442

Comment:
> Should we keep fix-math_fenv_h patch?
I removed both patches and it seems to work ok.

There is an issue with cross compilation. I don't think it is ok to use the host system ecl to bootstrap because it creates C files for the host system. Rather one needs to host-compile the ecl with target-system settings, then use ecl that to build the target ecl.

Right now the problem shows in that target-system settings disable `long long` but host-system has `long long` enabled, which results in
```
Error code 1 when executing
(EXT:RUN-PROGRAM "armv7l-linux-gnueabihf-gcc" ("-o" "bin/ecl" "-L/builddir/ecl-21.2.1/build/" "/builddir/ecl-21.2.1/build/eclinit3Pk084.o" "-L./" "-Wl,--rpath,/usr/lib32/" "-Wl,-z,relro" "-Wl,-z,now" "-Wl,--as-needed" "-L/usr/armv7l-linux-gnueabihf/usr/lib" "libecl.so" "-lgc" "-lgc" "-lgc" "-lpthread" "-ldl" ...)):
/usr/lib/gcc/armv7l-linux-gnueabihf/10.2.1/../../../../armv7l-linux-gnueabihf/bin/ld: libecl.so: undefined reference to `ecl_to_ulong_long'
```
This can be fixed by enabling `long long` in target-system (why is it disabled? don't `armv6l` and `armv7l` have a 64 bit `long long`?). Cf https://gitlab.com/embeddable-common-lisp/ecl/-/issues/579 and https://gitlab.com/embeddable-common-lisp/ecl/-/commit/9137c681a8533a11196269d90a99b94a4fbd229c

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [PR PATCH] [Updated] ecl: update to 21.2.1.
  2021-08-24 23:33 [PR PATCH] ecl: update to 21.2.1 tornaria
  2021-08-25  7:36 ` dkwo
  2021-08-25 13:00 ` tornaria
@ 2021-08-25 13:02 ` tornaria
  2021-08-25 17:15 ` ericonr
                   ` (17 subsequent siblings)
  20 siblings, 0 replies; 22+ messages in thread
From: tornaria @ 2021-08-25 13:02 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 408 bytes --]

There is an updated pull request by tornaria against master on the void-packages repository

https://github.com/tornaria/void-packages ecl
https://github.com/void-linux/void-packages/pull/32659

ecl: update to 21.2.1.
I compiled and doctested sage-9.4 with this PR + other updates and new packages. All working fine.

A patch file from https://github.com/void-linux/void-packages/pull/32659.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ecl-32659.patch --]
[-- Type: text/x-diff, Size: 7988 bytes --]

From 084eb7aa9d496728a9e6b27b098125e43d889657 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 24 Aug 2021 18:55:59 -0300
Subject: [PATCH] ecl: update to 21.2.1.

---
 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/patches/fix-libffi-system.patch | 16 ----
 srcpkgs/ecl/patches/fix-math_fenv_h.patch   | 99 ---------------------
 srcpkgs/ecl/template                        |  6 +-
 7 files changed, 15 insertions(+), 130 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/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 <stdint.h>"
 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 <stdint.h>"
 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 <stdint.h>"
 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 <stdint.h>"
 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/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 <knusbaum+void@sdf.org>"
 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

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: ecl: update to 21.2.1.
  2021-08-24 23:33 [PR PATCH] ecl: update to 21.2.1 tornaria
                   ` (2 preceding siblings ...)
  2021-08-25 13:02 ` [PR PATCH] [Updated] " tornaria
@ 2021-08-25 17:15 ` ericonr
  2021-08-25 17:38 ` tornaria
                   ` (16 subsequent siblings)
  20 siblings, 0 replies; 22+ messages in thread
From: ericonr @ 2021-08-25 17:15 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 332 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/32659#issuecomment-905722653

Comment:
> This can be fixed by enabling long long in target-system (why is it disabled? don't armv6l and armv7l have a 64 bit long long?). 

They do, but it seems you fixed with `int64_t` directly?

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: ecl: update to 21.2.1.
  2021-08-24 23:33 [PR PATCH] ecl: update to 21.2.1 tornaria
                   ` (3 preceding siblings ...)
  2021-08-25 17:15 ` ericonr
@ 2021-08-25 17:38 ` tornaria
  2021-08-25 19:20 ` tornaria
                   ` (15 subsequent siblings)
  20 siblings, 0 replies; 22+ messages in thread
From: tornaria @ 2021-08-25 17:38 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 484 bytes --]

New comment by tornaria on void-packages repository

https://github.com/void-linux/void-packages/pull/32659#issuecomment-905739802

Comment:
> > This can be fixed by enabling long long in target-system (why is it disabled? don't armv6l and armv7l have a 64 bit long long?).
> 
> They do, but it seems you fixed with `int64_t` directly?
No, I think the fix is to enable long long. I also enabled uint64_t and int64_t since it seemed the right thing to do, but that's not the fix.


^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: ecl: update to 21.2.1.
  2021-08-24 23:33 [PR PATCH] ecl: update to 21.2.1 tornaria
                   ` (4 preceding siblings ...)
  2021-08-25 17:38 ` tornaria
@ 2021-08-25 19:20 ` tornaria
  2021-08-27 17:39 ` ericonr
                   ` (14 subsequent siblings)
  20 siblings, 0 replies; 22+ messages in thread
From: tornaria @ 2021-08-25 19:20 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 486 bytes --]

New comment by tornaria on void-packages repository

https://github.com/void-linux/void-packages/pull/32659#issuecomment-905739802

Comment:
> > This can be fixed by enabling long long in target-system (why is it disabled? don't armv6l and armv7l have a 64 bit long long?).
> 
> They do, but it seems you fixed with `int64_t` directly?

No, I think the fix is to enable long long. I also enabled uint64_t and int64_t since it seemed the right thing to do, but that's not the fix.


^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: ecl: update to 21.2.1.
  2021-08-24 23:33 [PR PATCH] ecl: update to 21.2.1 tornaria
                   ` (5 preceding siblings ...)
  2021-08-25 19:20 ` tornaria
@ 2021-08-27 17:39 ` ericonr
  2021-08-27 20:21 ` [PR PATCH] [Updated] " tornaria
                   ` (13 subsequent siblings)
  20 siblings, 0 replies; 22+ messages in thread
From: ericonr @ 2021-08-27 17:39 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 307 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/32659#issuecomment-907365387

Comment:
Ok. Supposedly this should be fixed in all the conf files for 32bit platforms. I kinda want to remove the mips and armv5 ones, but I don't think we need to do it yet.

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [PR PATCH] [Updated] ecl: update to 21.2.1.
  2021-08-24 23:33 [PR PATCH] ecl: update to 21.2.1 tornaria
                   ` (6 preceding siblings ...)
  2021-08-27 17:39 ` ericonr
@ 2021-08-27 20:21 ` tornaria
  2021-08-27 20:22 ` tornaria
                   ` (12 subsequent siblings)
  20 siblings, 0 replies; 22+ messages in thread
From: tornaria @ 2021-08-27 20:21 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 408 bytes --]

There is an updated pull request by tornaria against master on the void-packages repository

https://github.com/tornaria/void-packages ecl
https://github.com/void-linux/void-packages/pull/32659

ecl: update to 21.2.1.
I compiled and doctested sage-9.4 with this PR + other updates and new packages. All working fine.

A patch file from https://github.com/void-linux/void-packages/pull/32659.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ecl-32659.patch --]
[-- Type: text/x-diff, Size: 14773 bytes --]

From de07d93199e3e8d9c9d81777c72bb10d80772dfd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
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 <stdint.h>"
 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 <stdint.h>"
 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 <stdint.h>"
 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 <stdint.h>"
 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 <stdint.h>"
 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 <stdint.h>"
 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 <stdint.h>"
 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 <stdint.h>"
 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 <stdint.h>"
 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 <stdint.h>"
 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 <stdint.h>"
 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 <stdint.h>"
 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 <knusbaum+void@sdf.org>"
 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

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: ecl: update to 21.2.1.
  2021-08-24 23:33 [PR PATCH] ecl: update to 21.2.1 tornaria
                   ` (7 preceding siblings ...)
  2021-08-27 20:21 ` [PR PATCH] [Updated] " tornaria
@ 2021-08-27 20:22 ` tornaria
  2021-09-13  7:39 ` dkwo
                   ` (11 subsequent siblings)
  20 siblings, 0 replies; 22+ messages in thread
From: tornaria @ 2021-08-27 20:22 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 265 bytes --]

New comment by tornaria on void-packages repository

https://github.com/void-linux/void-packages/pull/32659#issuecomment-907456182

Comment:
I changed all conf-files.

Note that cross-compiling for big-endian target on little-endian host may be broken as well...

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: ecl: update to 21.2.1.
  2021-08-24 23:33 [PR PATCH] ecl: update to 21.2.1 tornaria
                   ` (8 preceding siblings ...)
  2021-08-27 20:22 ` tornaria
@ 2021-09-13  7:39 ` dkwo
  2021-09-14 20:44 ` tornaria
                   ` (10 subsequent siblings)
  20 siblings, 0 replies; 22+ messages in thread
From: dkwo @ 2021-09-13  7:39 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 371 bytes --]

New comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/32659#issuecomment-917924870

Comment:
Regarding one of pullmoll's deleted patches, I've inquired upstream and they suggested to test a reduced version of it: would you mind including in this PR?

https://gitlab.com/embeddable-common-lisp/ecl/-/issues/653#note_675299471

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: ecl: update to 21.2.1.
  2021-08-24 23:33 [PR PATCH] ecl: update to 21.2.1 tornaria
                   ` (9 preceding siblings ...)
  2021-09-13  7:39 ` dkwo
@ 2021-09-14 20:44 ` tornaria
  2021-09-14 22:49 ` tornaria
                   ` (9 subsequent siblings)
  20 siblings, 0 replies; 22+ messages in thread
From: tornaria @ 2021-09-14 20:44 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 541 bytes --]

New comment by tornaria on void-packages repository

https://github.com/void-linux/void-packages/pull/32659#issuecomment-919498964

Comment:
> Regarding one of pullmoll's deleted patches, I've inquired upstream and they suggested to test a reduced version of it: would you mind including in this PR?
> 
> https://gitlab.com/embeddable-common-lisp/ecl/-/issues/653#note_675299471

Do you know what architectures need this? Including the patch seems to be noop for all the archs I can test on, so I wouldn't be able to answer if it works.

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: ecl: update to 21.2.1.
  2021-08-24 23:33 [PR PATCH] ecl: update to 21.2.1 tornaria
                   ` (10 preceding siblings ...)
  2021-09-14 20:44 ` tornaria
@ 2021-09-14 22:49 ` tornaria
  2021-09-14 22:49 ` [PR PATCH] [Updated] " tornaria
                   ` (8 subsequent siblings)
  20 siblings, 0 replies; 22+ messages in thread
From: tornaria @ 2021-09-14 22:49 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 712 bytes --]

New comment by tornaria on void-packages repository

https://github.com/void-linux/void-packages/pull/32659#issuecomment-919565304

Comment:
> > Regarding one of pullmoll's deleted patches, I've inquired upstream and they suggested to test a reduced version of it: would you mind including in this PR?
> > https://gitlab.com/embeddable-common-lisp/ecl/-/issues/653#note_675299471
> 
> Do you know what architectures need this? Including the patch seems to be noop for all the archs I can test on, so I wouldn't be able to answer if it works.

I tried cross compilation for `mips-musl` and indeed it fails without the patch. With the patch it builds and packages ok (although I haven't tested the binary).


^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [PR PATCH] [Updated] ecl: update to 21.2.1.
  2021-08-24 23:33 [PR PATCH] ecl: update to 21.2.1 tornaria
                   ` (11 preceding siblings ...)
  2021-09-14 22:49 ` tornaria
@ 2021-09-14 22:49 ` tornaria
  2021-09-14 22:54 ` tornaria
                   ` (7 subsequent siblings)
  20 siblings, 0 replies; 22+ messages in thread
From: tornaria @ 2021-09-14 22:49 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 408 bytes --]

There is an updated pull request by tornaria against master on the void-packages repository

https://github.com/tornaria/void-packages ecl
https://github.com/void-linux/void-packages/pull/32659

ecl: update to 21.2.1.
I compiled and doctested sage-9.4 with this PR + other updates and new packages. All working fine.

A patch file from https://github.com/void-linux/void-packages/pull/32659.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ecl-32659.patch --]
[-- Type: text/x-diff, Size: 42181 bytes --]

From 5bbfdb555022a15832893026d9077a3b3399e5f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 24 Aug 2021 18:55:59 -0300
Subject: [PATCH] ecl: update to 21.2.1.

Also:
- remove fix-libffi-system.patch (not needed anymore)
- clean-up fix-math_fenv_h.patch
  upstream: https://gitlab.com/embeddable-common-lisp/ecl/-/issues/653#note_675299471
- add long long, int64_t and uint64_t in all the cross_config files;
  compilation fails when long long is enabled in host but disabled in target.
- replace the per-arch cross_config files by the 4 different ones {32,64}{be,le}.conf
---
 .../ecl/files/{mips-musl.conf => 32be.conf}   |   6 +-
 .../ecl/files/{mipsel-musl.conf => 32le.conf} |   6 +-
 .../files/{aarch64-musl.conf => 64be.conf}    |   4 +-
 .../ecl/files/{x86_64-musl.conf => 64le.conf} |   0
 srcpkgs/ecl/files/aarch64.conf                |  63 ---------
 srcpkgs/ecl/files/armv5tel-musl.conf          |  63 ---------
 srcpkgs/ecl/files/armv5tel.conf               |  63 ---------
 srcpkgs/ecl/files/armv6l-musl.conf            |  63 ---------
 srcpkgs/ecl/files/armv6l.conf                 |  63 ---------
 srcpkgs/ecl/files/armv7l-musl.conf            |  63 ---------
 srcpkgs/ecl/files/armv7l.conf                 |  63 ---------
 srcpkgs/ecl/files/mipselhf-musl.conf          |  63 ---------
 srcpkgs/ecl/files/mipshf-musl.conf            |  63 ---------
 srcpkgs/ecl/files/ppc-musl.conf               |  63 ---------
 srcpkgs/ecl/files/ppc.conf                    |  63 ---------
 srcpkgs/ecl/files/ppc64-musl.conf             |  63 ---------
 srcpkgs/ecl/files/ppc64.conf                  |  63 ---------
 srcpkgs/ecl/files/ppc64le-musl.conf           |  63 ---------
 srcpkgs/ecl/files/ppc64le.conf                |  63 ---------
 srcpkgs/ecl/patches/fix-libffi-system.patch   |  16 ---
 srcpkgs/ecl/patches/fix-math_fenv_h.patch     | 124 ++++--------------
 srcpkgs/ecl/template                          |   8 +-
 22 files changed, 40 insertions(+), 1069 deletions(-)
 rename srcpkgs/ecl/files/{mips-musl.conf => 32be.conf} (96%)
 rename srcpkgs/ecl/files/{mipsel-musl.conf => 32le.conf} (96%)
 rename srcpkgs/ecl/files/{aarch64-musl.conf => 64be.conf} (97%)
 rename srcpkgs/ecl/files/{x86_64-musl.conf => 64le.conf} (100%)
 delete mode 100644 srcpkgs/ecl/files/aarch64.conf
 delete mode 100644 srcpkgs/ecl/files/armv5tel-musl.conf
 delete mode 100644 srcpkgs/ecl/files/armv5tel.conf
 delete mode 100644 srcpkgs/ecl/files/armv6l-musl.conf
 delete mode 100644 srcpkgs/ecl/files/armv6l.conf
 delete mode 100644 srcpkgs/ecl/files/armv7l-musl.conf
 delete mode 100644 srcpkgs/ecl/files/armv7l.conf
 delete mode 100644 srcpkgs/ecl/files/mipselhf-musl.conf
 delete mode 100644 srcpkgs/ecl/files/mipshf-musl.conf
 delete mode 100644 srcpkgs/ecl/files/ppc-musl.conf
 delete mode 100644 srcpkgs/ecl/files/ppc.conf
 delete mode 100644 srcpkgs/ecl/files/ppc64-musl.conf
 delete mode 100644 srcpkgs/ecl/files/ppc64.conf
 delete mode 100644 srcpkgs/ecl/files/ppc64le-musl.conf
 delete mode 100644 srcpkgs/ecl/files/ppc64le.conf
 delete mode 100644 srcpkgs/ecl/patches/fix-libffi-system.patch

diff --git a/srcpkgs/ecl/files/mips-musl.conf b/srcpkgs/ecl/files/32be.conf
similarity index 96%
rename from srcpkgs/ecl/files/mips-musl.conf
rename to srcpkgs/ecl/files/32be.conf
index 2198241b6ed7..dd18eb8e0e57 100644
--- a/srcpkgs/ecl/files/mips-musl.conf
+++ b/srcpkgs/ecl/files/32be.conf
@@ -41,12 +41,12 @@ ECL_STDINT_HEADER="#include <stdint.h>"
 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/32le.conf
similarity index 96%
rename from srcpkgs/ecl/files/mipsel-musl.conf
rename to srcpkgs/ecl/files/32le.conf
index 0b553b267032..c037e1a47891 100644
--- a/srcpkgs/ecl/files/mipsel-musl.conf
+++ b/srcpkgs/ecl/files/32le.conf
@@ -41,12 +41,12 @@ ECL_STDINT_HEADER="#include <stdint.h>"
 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/aarch64-musl.conf b/srcpkgs/ecl/files/64be.conf
similarity index 97%
rename from srcpkgs/ecl/files/aarch64-musl.conf
rename to srcpkgs/ecl/files/64be.conf
index 048053eeb066..3b105d923228 100644
--- a/srcpkgs/ecl/files/aarch64-musl.conf
+++ b/srcpkgs/ecl/files/64be.conf
@@ -20,7 +20,7 @@ CL_INT_BITS=32
 CL_LONG_BITS=64
 
 ### 1.3) Order of bytes within a word
-ECL_BIGENDIAN=no
+ECL_BIGENDIAN=yes
 
 ### 1.4) What characters signal an end of line. May be LF (Linefeed or \n)
 ###      CR (Carriage return or \r), and CRLF (CR followed by LF).
@@ -54,7 +54,7 @@ ECL_LONG_LONG_BITS=64
 ECL_WORKING_ENVIRON=yes
 
 ### 2) To cross-compile ECL so that it runs on the system
-###		aarch64-unknown-linux-gnu
+###		x86_64-unknown-linux-musl
 ### you need to first compile ECL on the system in which you are building
 ### the cross-compiled files, that is
 ###		x86_64-unknown-linux-gnu
diff --git a/srcpkgs/ecl/files/x86_64-musl.conf b/srcpkgs/ecl/files/64le.conf
similarity index 100%
rename from srcpkgs/ecl/files/x86_64-musl.conf
rename to srcpkgs/ecl/files/64le.conf
diff --git a/srcpkgs/ecl/files/aarch64.conf b/srcpkgs/ecl/files/aarch64.conf
deleted file mode 100644
index 048053eeb066..000000000000
--- a/srcpkgs/ecl/files/aarch64.conf
+++ /dev/null
@@ -1,63 +0,0 @@
-###
-### YOU ARE TRYING TO CROSS COMPILE ECL.
-### PLEASE FOLLOW THESE INSTRUCTIONS:
-###
-### 1) Vital information cannot be determined at configuration time
-### because we are not able to run test programs. A file called
-###		
-### has been created, that you will have to fill out. Please do
-### it before invoking "configure" again.
-
-### 1.1) Direction of growth of the stack
-ECL_STACK_DIR=down
-
-### 1.2) Choose an integer datatype which is large enough to host a pointer
-CL_FIXNUM_TYPE="long long int"
-CL_FIXNUM_BITS=64
-CL_FIXNUM_MAX=2305843009213693951LL
-CL_FIXNUM_MIN=-2305843009213693952LL
-CL_INT_BITS=32
-CL_LONG_BITS=64
-
-### 1.3) Order of bytes within a word
-ECL_BIGENDIAN=no
-
-### 1.4) What characters signal an end of line. May be LF (Linefeed or \n)
-###      CR (Carriage return or \r), and CRLF (CR followed by LF).
-ECL_NEWLINE=LF
-
-### 1.5) Can we guess how many characters are available for reading from
-###      the FILE structure?
-###          0 = no
-###          1 = (f)->_IO_read_end - (f)->_IO_read_ptr
-###          2 = (f)->_r
-###          3 = (f)->_cnt
-ECL_FILE_CNT=0
-
-###
-### 1.6) Other integer types (set to 'no' to disable)
-###
-ECL_STDINT_HEADER="#include <stdint.h>"
-ECL_UINT8_T=uint8_t
-ECL_UINT16_T=uint16_t
-ECL_UINT32_T=uint32_t
-ECL_UINT64_T=uint64_t
-ECL_INT8_T=int8_t
-ECL_INT16_T=int16_t
-ECL_INT32_T=int32_t
-ECL_INT64_T=int64_t
-ECL_LONG_LONG_BITS=64
-
-###
-### 1.7) Other features (set to 'no' to disable)
-###
-ECL_WORKING_ENVIRON=yes
-
-### 2) To cross-compile ECL so that it runs on the system
-###		aarch64-unknown-linux-gnu
-### you need to first compile ECL on the system in which you are building
-### the cross-compiled files, that is
-###		x86_64-unknown-linux-gnu
-### By default we assume that ECL can be accessed from some directory in
-### the path.
-ECL_TO_RUN=/usr/bin/ecl
diff --git a/srcpkgs/ecl/files/armv5tel-musl.conf b/srcpkgs/ecl/files/armv5tel-musl.conf
deleted file mode 100644
index b633337b9ff7..000000000000
--- a/srcpkgs/ecl/files/armv5tel-musl.conf
+++ /dev/null
@@ -1,63 +0,0 @@
-###
-### YOU ARE TRYING TO CROSS COMPILE ECL.
-### PLEASE FOLLOW THESE INSTRUCTIONS:
-###
-### 1) Vital information cannot be determined at configuration time
-### because we are not able to run test programs. A file called
-###		
-### has been created, that you will have to fill out. Please do
-### it before invoking "configure" again.
-
-### 1.1) Direction of growth of the stack
-ECL_STACK_DIR=down
-
-### 1.2) Choose an integer datatype which is large enough to host a pointer
-CL_FIXNUM_TYPE=int
-CL_FIXNUM_BITS=32
-CL_FIXNUM_MAX=536870911L
-CL_FIXNUM_MIN=-536870912L
-CL_INT_BITS=32
-CL_LONG_BITS=32
-
-### 1.3) Order of bytes within a word
-ECL_BIGENDIAN=no
-
-### 1.4) What characters signal an end of line. May be LF (Linefeed or \n)
-###      CR (Carriage return or \r), and CRLF (CR followed by LF).
-ECL_NEWLINE=LF
-
-### 1.5) Can we guess how many characters are available for reading from
-###      the FILE structure?
-###          0 = no
-###          1 = (f)->_IO_read_end - (f)->_IO_read_ptr
-###          2 = (f)->_r
-###          3 = (f)->_cnt
-ECL_FILE_CNT=0
-
-###
-### 1.6) Other integer types (set to 'no' to disable)
-###
-ECL_STDINT_HEADER="#include <stdint.h>"
-ECL_UINT8_T=uint8_t
-ECL_UINT16_T=uint16_t
-ECL_UINT32_T=uint32_t
-ECL_UINT64_T=no
-ECL_INT8_T=int8_t
-ECL_INT16_T=int16_t
-ECL_INT32_T=int32_t
-ECL_INT64_T=no
-ECL_LONG_LONG_BITS=no
-
-###
-### 1.7) Other features (set to 'no' to disable)
-###
-ECL_WORKING_ENVIRON=yes
-
-### 2) To cross-compile ECL so that it runs on the system
-###		arm-unknown-linux-musleabi
-### you need to first compile ECL on the system in which you are building
-### the cross-compiled files, that is
-###		i686-pc-linux-musl
-### By default we assume that ECL can be accessed from some directory in
-### the path.
-ECL_TO_RUN=/usr/bin/ecl
diff --git a/srcpkgs/ecl/files/armv5tel.conf b/srcpkgs/ecl/files/armv5tel.conf
deleted file mode 100644
index 6233550c94d9..000000000000
--- a/srcpkgs/ecl/files/armv5tel.conf
+++ /dev/null
@@ -1,63 +0,0 @@
-###
-### YOU ARE TRYING TO CROSS COMPILE ECL.
-### PLEASE FOLLOW THESE INSTRUCTIONS:
-###
-### 1) Vital information cannot be determined at configuration time
-### because we are not able to run test programs. A file called
-###		
-### has been created, that you will have to fill out. Please do
-### it before invoking "configure" again.
-
-### 1.1) Direction of growth of the stack
-ECL_STACK_DIR=down
-
-### 1.2) Choose an integer datatype which is large enough to host a pointer
-CL_FIXNUM_TYPE=int
-CL_FIXNUM_BITS=32
-CL_FIXNUM_MAX=536870911L
-CL_FIXNUM_MIN=-536870912L
-CL_INT_BITS=32
-CL_LONG_BITS=32
-
-### 1.3) Order of bytes within a word
-ECL_BIGENDIAN=no
-
-### 1.4) What characters signal an end of line. May be LF (Linefeed or \n)
-###      CR (Carriage return or \r), and CRLF (CR followed by LF).
-ECL_NEWLINE=LF
-
-### 1.5) Can we guess how many characters are available for reading from
-###      the FILE structure?
-###          0 = no
-###          1 = (f)->_IO_read_end - (f)->_IO_read_ptr
-###          2 = (f)->_r
-###          3 = (f)->_cnt
-ECL_FILE_CNT=0
-
-###
-### 1.6) Other integer types (set to 'no' to disable)
-###
-ECL_STDINT_HEADER="#include <stdint.h>"
-ECL_UINT8_T=uint8_t
-ECL_UINT16_T=uint16_t
-ECL_UINT32_T=uint32_t
-ECL_UINT64_T=no
-ECL_INT8_T=int8_t
-ECL_INT16_T=int16_t
-ECL_INT32_T=int32_t
-ECL_INT64_T=no
-ECL_LONG_LONG_BITS=no
-
-###
-### 1.7) Other features (set to 'no' to disable)
-###
-ECL_WORKING_ENVIRON=yes
-
-### 2) To cross-compile ECL so that it runs on the system
-###		arm-unknown-linux-gnueabi
-### you need to first compile ECL on the system in which you are building
-### the cross-compiled files, that is
-###		i686-pc-linux-gnu
-### By default we assume that ECL can be accessed from some directory in
-### the path.
-ECL_TO_RUN=/usr/bin/ecl
diff --git a/srcpkgs/ecl/files/armv6l-musl.conf b/srcpkgs/ecl/files/armv6l-musl.conf
deleted file mode 100644
index a48cd8bd4d2f..000000000000
--- a/srcpkgs/ecl/files/armv6l-musl.conf
+++ /dev/null
@@ -1,63 +0,0 @@
-###
-### YOU ARE TRYING TO CROSS COMPILE ECL.
-### PLEASE FOLLOW THESE INSTRUCTIONS:
-###
-### 1) Vital information cannot be determined at configuration time
-### because we are not able to run test programs. A file called
-###		
-### has been created, that you will have to fill out. Please do
-### it before invoking "configure" again.
-
-### 1.1) Direction of growth of the stack
-ECL_STACK_DIR=down
-
-### 1.2) Choose an integer datatype which is large enough to host a pointer
-CL_FIXNUM_TYPE=int
-CL_FIXNUM_BITS=32
-CL_FIXNUM_MAX=536870911L
-CL_FIXNUM_MIN=-536870912L
-CL_INT_BITS=32
-CL_LONG_BITS=32
-
-### 1.3) Order of bytes within a word
-ECL_BIGENDIAN=no
-
-### 1.4) What characters signal an end of line. May be LF (Linefeed or \n)
-###      CR (Carriage return or \r), and CRLF (CR followed by LF).
-ECL_NEWLINE=LF
-
-### 1.5) Can we guess how many characters are available for reading from
-###      the FILE structure?
-###          0 = no
-###          1 = (f)->_IO_read_end - (f)->_IO_read_ptr
-###          2 = (f)->_r
-###          3 = (f)->_cnt
-ECL_FILE_CNT=0
-
-###
-### 1.6) Other integer types (set to 'no' to disable)
-###
-ECL_STDINT_HEADER="#include <stdint.h>"
-ECL_UINT8_T=uint8_t
-ECL_UINT16_T=uint16_t
-ECL_UINT32_T=uint32_t
-ECL_UINT64_T=no
-ECL_INT8_T=int8_t
-ECL_INT16_T=int16_t
-ECL_INT32_T=int32_t
-ECL_INT64_T=no
-ECL_LONG_LONG_BITS=no
-
-###
-### 1.7) Other features (set to 'no' to disable)
-###
-ECL_WORKING_ENVIRON=yes
-
-### 2) To cross-compile ECL so that it runs on the system
-###		armv7l-unknown-linux-musleabihf
-### you need to first compile ECL on the system in which you are building
-### the cross-compiled files, that is
-###		x86_64-unknown-linux-gnu
-### By default we assume that ECL can be accessed from some directory in
-### the path.
-ECL_TO_RUN=/usr/bin/ecl
diff --git a/srcpkgs/ecl/files/armv6l.conf b/srcpkgs/ecl/files/armv6l.conf
deleted file mode 100644
index a48cd8bd4d2f..000000000000
--- a/srcpkgs/ecl/files/armv6l.conf
+++ /dev/null
@@ -1,63 +0,0 @@
-###
-### YOU ARE TRYING TO CROSS COMPILE ECL.
-### PLEASE FOLLOW THESE INSTRUCTIONS:
-###
-### 1) Vital information cannot be determined at configuration time
-### because we are not able to run test programs. A file called
-###		
-### has been created, that you will have to fill out. Please do
-### it before invoking "configure" again.
-
-### 1.1) Direction of growth of the stack
-ECL_STACK_DIR=down
-
-### 1.2) Choose an integer datatype which is large enough to host a pointer
-CL_FIXNUM_TYPE=int
-CL_FIXNUM_BITS=32
-CL_FIXNUM_MAX=536870911L
-CL_FIXNUM_MIN=-536870912L
-CL_INT_BITS=32
-CL_LONG_BITS=32
-
-### 1.3) Order of bytes within a word
-ECL_BIGENDIAN=no
-
-### 1.4) What characters signal an end of line. May be LF (Linefeed or \n)
-###      CR (Carriage return or \r), and CRLF (CR followed by LF).
-ECL_NEWLINE=LF
-
-### 1.5) Can we guess how many characters are available for reading from
-###      the FILE structure?
-###          0 = no
-###          1 = (f)->_IO_read_end - (f)->_IO_read_ptr
-###          2 = (f)->_r
-###          3 = (f)->_cnt
-ECL_FILE_CNT=0
-
-###
-### 1.6) Other integer types (set to 'no' to disable)
-###
-ECL_STDINT_HEADER="#include <stdint.h>"
-ECL_UINT8_T=uint8_t
-ECL_UINT16_T=uint16_t
-ECL_UINT32_T=uint32_t
-ECL_UINT64_T=no
-ECL_INT8_T=int8_t
-ECL_INT16_T=int16_t
-ECL_INT32_T=int32_t
-ECL_INT64_T=no
-ECL_LONG_LONG_BITS=no
-
-###
-### 1.7) Other features (set to 'no' to disable)
-###
-ECL_WORKING_ENVIRON=yes
-
-### 2) To cross-compile ECL so that it runs on the system
-###		armv7l-unknown-linux-musleabihf
-### you need to first compile ECL on the system in which you are building
-### the cross-compiled files, that is
-###		x86_64-unknown-linux-gnu
-### By default we assume that ECL can be accessed from some directory in
-### the path.
-ECL_TO_RUN=/usr/bin/ecl
diff --git a/srcpkgs/ecl/files/armv7l-musl.conf b/srcpkgs/ecl/files/armv7l-musl.conf
deleted file mode 100644
index c70a38d248a3..000000000000
--- a/srcpkgs/ecl/files/armv7l-musl.conf
+++ /dev/null
@@ -1,63 +0,0 @@
-###
-### YOU ARE TRYING TO CROSS COMPILE ECL.
-### PLEASE FOLLOW THESE INSTRUCTIONS:
-###
-### 1) Vital information cannot be determined at configuration time
-### because we are not able to run test programs. A file called
-###		
-### has been created, that you will have to fill out. Please do
-### it before invoking "configure" again.
-
-### 1.1) Direction of growth of the stack
-ECL_STACK_DIR=down
-
-### 1.2) Choose an integer datatype which is large enough to host a pointer
-CL_FIXNUM_TYPE=int
-CL_FIXNUM_BITS=32
-CL_FIXNUM_MAX=536870911L
-CL_FIXNUM_MIN=-536870912L
-CL_INT_BITS=32
-CL_LONG_BITS=32
-
-### 1.3) Order of bytes within a word
-ECL_BIGENDIAN=no
-
-### 1.4) What characters signal an end of line. May be LF (Linefeed or \n)
-###      CR (Carriage return or \r), and CRLF (CR followed by LF).
-ECL_NEWLINE=LF
-
-### 1.5) Can we guess how many characters are available for reading from
-###      the FILE structure?
-###          0 = no
-###          1 = (f)->_IO_read_end - (f)->_IO_read_ptr
-###          2 = (f)->_r
-###          3 = (f)->_cnt
-ECL_FILE_CNT=0
-
-###
-### 1.6) Other integer types (set to 'no' to disable)
-###
-ECL_STDINT_HEADER="#include <stdint.h>"
-ECL_UINT8_T=uint8_t
-ECL_UINT16_T=uint16_t
-ECL_UINT32_T=uint32_t
-ECL_UINT64_T=no
-ECL_INT8_T=int8_t
-ECL_INT16_T=int16_t
-ECL_INT32_T=int32_t
-ECL_INT64_T=no
-ECL_LONG_LONG_BITS=no
-
-###
-### 1.7) Other features (set to 'no' to disable)
-###
-ECL_WORKING_ENVIRON=yes
-
-### 2) To cross-compile ECL so that it runs on the system
-###		armv7l-unknown-linux-gnueabihf
-### you need to first compile ECL on the system in which you are building
-### the cross-compiled files, that is
-###		x86_64-unknown-linux-gnu
-### By default we assume that ECL can be accessed from some directory in
-### the path.
-ECL_TO_RUN=/usr/bin/ecl
diff --git a/srcpkgs/ecl/files/armv7l.conf b/srcpkgs/ecl/files/armv7l.conf
deleted file mode 100644
index c70a38d248a3..000000000000
--- a/srcpkgs/ecl/files/armv7l.conf
+++ /dev/null
@@ -1,63 +0,0 @@
-###
-### YOU ARE TRYING TO CROSS COMPILE ECL.
-### PLEASE FOLLOW THESE INSTRUCTIONS:
-###
-### 1) Vital information cannot be determined at configuration time
-### because we are not able to run test programs. A file called
-###		
-### has been created, that you will have to fill out. Please do
-### it before invoking "configure" again.
-
-### 1.1) Direction of growth of the stack
-ECL_STACK_DIR=down
-
-### 1.2) Choose an integer datatype which is large enough to host a pointer
-CL_FIXNUM_TYPE=int
-CL_FIXNUM_BITS=32
-CL_FIXNUM_MAX=536870911L
-CL_FIXNUM_MIN=-536870912L
-CL_INT_BITS=32
-CL_LONG_BITS=32
-
-### 1.3) Order of bytes within a word
-ECL_BIGENDIAN=no
-
-### 1.4) What characters signal an end of line. May be LF (Linefeed or \n)
-###      CR (Carriage return or \r), and CRLF (CR followed by LF).
-ECL_NEWLINE=LF
-
-### 1.5) Can we guess how many characters are available for reading from
-###      the FILE structure?
-###          0 = no
-###          1 = (f)->_IO_read_end - (f)->_IO_read_ptr
-###          2 = (f)->_r
-###          3 = (f)->_cnt
-ECL_FILE_CNT=0
-
-###
-### 1.6) Other integer types (set to 'no' to disable)
-###
-ECL_STDINT_HEADER="#include <stdint.h>"
-ECL_UINT8_T=uint8_t
-ECL_UINT16_T=uint16_t
-ECL_UINT32_T=uint32_t
-ECL_UINT64_T=no
-ECL_INT8_T=int8_t
-ECL_INT16_T=int16_t
-ECL_INT32_T=int32_t
-ECL_INT64_T=no
-ECL_LONG_LONG_BITS=no
-
-###
-### 1.7) Other features (set to 'no' to disable)
-###
-ECL_WORKING_ENVIRON=yes
-
-### 2) To cross-compile ECL so that it runs on the system
-###		armv7l-unknown-linux-gnueabihf
-### you need to first compile ECL on the system in which you are building
-### the cross-compiled files, that is
-###		x86_64-unknown-linux-gnu
-### By default we assume that ECL can be accessed from some directory in
-### the path.
-ECL_TO_RUN=/usr/bin/ecl
diff --git a/srcpkgs/ecl/files/mipselhf-musl.conf b/srcpkgs/ecl/files/mipselhf-musl.conf
deleted file mode 100644
index 0b553b267032..000000000000
--- a/srcpkgs/ecl/files/mipselhf-musl.conf
+++ /dev/null
@@ -1,63 +0,0 @@
-###
-### YOU ARE TRYING TO CROSS COMPILE ECL.
-### PLEASE FOLLOW THESE INSTRUCTIONS:
-###
-### 1) Vital information cannot be determined at configuration time
-### because we are not able to run test programs. A file called
-###		
-### has been created, that you will have to fill out. Please do
-### it before invoking "configure" again.
-
-### 1.1) Direction of growth of the stack
-ECL_STACK_DIR=down
-
-### 1.2) Choose an integer datatype which is large enough to host a pointer
-CL_FIXNUM_TYPE=int
-CL_FIXNUM_BITS=32
-CL_FIXNUM_MAX=536870911L
-CL_FIXNUM_MIN=-536870912L
-CL_INT_BITS=32
-CL_LONG_BITS=32
-
-### 1.3) Order of bytes within a word
-ECL_BIGENDIAN=no
-
-### 1.4) What characters signal an end of line. May be LF (Linefeed or \n)
-###      CR (Carriage return or \r), and CRLF (CR followed by LF).
-ECL_NEWLINE=LF
-
-### 1.5) Can we guess how many characters are available for reading from
-###      the FILE structure?
-###          0 = no
-###          1 = (f)->_IO_read_end - (f)->_IO_read_ptr
-###          2 = (f)->_r
-###          3 = (f)->_cnt
-ECL_FILE_CNT=0
-
-###
-### 1.6) Other integer types (set to 'no' to disable)
-###
-ECL_STDINT_HEADER="#include <stdint.h>"
-ECL_UINT8_T=uint8_t
-ECL_UINT16_T=uint16_t
-ECL_UINT32_T=uint32_t
-ECL_UINT64_T=no
-ECL_INT8_T=int8_t
-ECL_INT16_T=int16_t
-ECL_INT32_T=int32_t
-ECL_INT64_T=no
-ECL_LONG_LONG_BITS=no
-
-###
-### 1.7) Other features (set to 'no' to disable)
-###
-ECL_WORKING_ENVIRON=yes
-
-### 2) To cross-compile ECL so that it runs on the system
-###		mips-unknown-linux-musl
-### you need to first compile ECL on the system in which you are building
-### the cross-compiled files, that is
-###		x86_64-unknown-linux-gnu
-### By default we assume that ECL can be accessed from some directory in
-### the path.
-ECL_TO_RUN=/usr/bin/ecl
diff --git a/srcpkgs/ecl/files/mipshf-musl.conf b/srcpkgs/ecl/files/mipshf-musl.conf
deleted file mode 100644
index 2198241b6ed7..000000000000
--- a/srcpkgs/ecl/files/mipshf-musl.conf
+++ /dev/null
@@ -1,63 +0,0 @@
-###
-### YOU ARE TRYING TO CROSS COMPILE ECL.
-### PLEASE FOLLOW THESE INSTRUCTIONS:
-###
-### 1) Vital information cannot be determined at configuration time
-### because we are not able to run test programs. A file called
-###		
-### has been created, that you will have to fill out. Please do
-### it before invoking "configure" again.
-
-### 1.1) Direction of growth of the stack
-ECL_STACK_DIR=down
-
-### 1.2) Choose an integer datatype which is large enough to host a pointer
-CL_FIXNUM_TYPE=int
-CL_FIXNUM_BITS=32
-CL_FIXNUM_MAX=536870911L
-CL_FIXNUM_MIN=-536870912L
-CL_INT_BITS=32
-CL_LONG_BITS=32
-
-### 1.3) Order of bytes within a word
-ECL_BIGENDIAN=yes
-
-### 1.4) What characters signal an end of line. May be LF (Linefeed or \n)
-###      CR (Carriage return or \r), and CRLF (CR followed by LF).
-ECL_NEWLINE=LF
-
-### 1.5) Can we guess how many characters are available for reading from
-###      the FILE structure?
-###          0 = no
-###          1 = (f)->_IO_read_end - (f)->_IO_read_ptr
-###          2 = (f)->_r
-###          3 = (f)->_cnt
-ECL_FILE_CNT=0
-
-###
-### 1.6) Other integer types (set to 'no' to disable)
-###
-ECL_STDINT_HEADER="#include <stdint.h>"
-ECL_UINT8_T=uint8_t
-ECL_UINT16_T=uint16_t
-ECL_UINT32_T=uint32_t
-ECL_UINT64_T=no
-ECL_INT8_T=int8_t
-ECL_INT16_T=int16_t
-ECL_INT32_T=int32_t
-ECL_INT64_T=no
-ECL_LONG_LONG_BITS=no
-
-###
-### 1.7) Other features (set to 'no' to disable)
-###
-ECL_WORKING_ENVIRON=yes
-
-### 2) To cross-compile ECL so that it runs on the system
-###		mips-unknown-linux-musl
-### you need to first compile ECL on the system in which you are building
-### the cross-compiled files, that is
-###		x86_64-unknown-linux-gnu
-### By default we assume that ECL can be accessed from some directory in
-### the path.
-ECL_TO_RUN=/usr/bin/ecl
diff --git a/srcpkgs/ecl/files/ppc-musl.conf b/srcpkgs/ecl/files/ppc-musl.conf
deleted file mode 100644
index cdca29e1d613..000000000000
--- a/srcpkgs/ecl/files/ppc-musl.conf
+++ /dev/null
@@ -1,63 +0,0 @@
-###
-### YOU ARE TRYING TO CROSS COMPILE ECL.
-### PLEASE FOLLOW THESE INSTRUCTIONS:
-###
-### 1) Vital information cannot be determined at configuration time
-### because we are not able to run test programs. A file called
-###		
-### has been created, that you will have to fill out. Please do
-### it before invoking "configure" again.
-
-### 1.1) Direction of growth of the stack
-ECL_STACK_DIR=down
-
-### 1.2) Choose an integer datatype which is large enough to host a pointer
-CL_FIXNUM_TYPE=int
-CL_FIXNUM_BITS=32
-CL_FIXNUM_MAX=536870911L
-CL_FIXNUM_MIN=-536870912L
-CL_INT_BITS=32
-CL_LONG_BITS=32
-
-### 1.3) Order of bytes within a word
-ECL_BIGENDIAN=yes
-
-### 1.4) What characters signal an end of line. May be LF (Linefeed or \n)
-###      CR (Carriage return or \r), and CRLF (CR followed by LF).
-ECL_NEWLINE=LF
-
-### 1.5) Can we guess how many characters are available for reading from
-###      the FILE structure?
-###          0 = no
-###          1 = (f)->_IO_read_end - (f)->_IO_read_ptr
-###          2 = (f)->_r
-###          3 = (f)->_cnt
-ECL_FILE_CNT=0
-
-###
-### 1.6) Other integer types (set to 'no' to disable)
-###
-ECL_STDINT_HEADER="#include <stdint.h>"
-ECL_UINT8_T=uint8_t
-ECL_UINT16_T=uint16_t
-ECL_UINT32_T=uint32_t
-ECL_UINT64_T=no
-ECL_INT8_T=int8_t
-ECL_INT16_T=int16_t
-ECL_INT32_T=int32_t
-ECL_INT64_T=no
-ECL_LONG_LONG_BITS=no
-
-###
-### 1.7) Other features (set to 'no' to disable)
-###
-ECL_WORKING_ENVIRON=yes
-
-### 2) To cross-compile ECL so that it runs on the system
-###		powerpc-unknown-linux-musl
-### you need to first compile ECL on the system in which you are building
-### the cross-compiled files, that is
-###		i686-pc-linux-musl
-### By default we assume that ECL can be accessed from some directory in
-### the path.
-ECL_TO_RUN=/usr/bin/ecl
diff --git a/srcpkgs/ecl/files/ppc.conf b/srcpkgs/ecl/files/ppc.conf
deleted file mode 100644
index 8c5c3d1bb4d3..000000000000
--- a/srcpkgs/ecl/files/ppc.conf
+++ /dev/null
@@ -1,63 +0,0 @@
-###
-### YOU ARE TRYING TO CROSS COMPILE ECL.
-### PLEASE FOLLOW THESE INSTRUCTIONS:
-###
-### 1) Vital information cannot be determined at configuration time
-### because we are not able to run test programs. A file called
-###		
-### has been created, that you will have to fill out. Please do
-### it before invoking "configure" again.
-
-### 1.1) Direction of growth of the stack
-ECL_STACK_DIR=down
-
-### 1.2) Choose an integer datatype which is large enough to host a pointer
-CL_FIXNUM_TYPE=int
-CL_FIXNUM_BITS=32
-CL_FIXNUM_MAX=536870911L
-CL_FIXNUM_MIN=-536870912L
-CL_INT_BITS=32
-CL_LONG_BITS=32
-
-### 1.3) Order of bytes within a word
-ECL_BIGENDIAN=yes
-
-### 1.4) What characters signal an end of line. May be LF (Linefeed or \n)
-###      CR (Carriage return or \r), and CRLF (CR followed by LF).
-ECL_NEWLINE=LF
-
-### 1.5) Can we guess how many characters are available for reading from
-###      the FILE structure?
-###          0 = no
-###          1 = (f)->_IO_read_end - (f)->_IO_read_ptr
-###          2 = (f)->_r
-###          3 = (f)->_cnt
-ECL_FILE_CNT=0
-
-###
-### 1.6) Other integer types (set to 'no' to disable)
-###
-ECL_STDINT_HEADER="#include <stdint.h>"
-ECL_UINT8_T=uint8_t
-ECL_UINT16_T=uint16_t
-ECL_UINT32_T=uint32_t
-ECL_UINT64_T=no
-ECL_INT8_T=int8_t
-ECL_INT16_T=int16_t
-ECL_INT32_T=int32_t
-ECL_INT64_T=no
-ECL_LONG_LONG_BITS=no
-
-###
-### 1.7) Other features (set to 'no' to disable)
-###
-ECL_WORKING_ENVIRON=yes
-
-### 2) To cross-compile ECL so that it runs on the system
-###		powerpc-unknown-linux-gnu
-### you need to first compile ECL on the system in which you are building
-### the cross-compiled files, that is
-###		i686-pc-linux-gnu
-### By default we assume that ECL can be accessed from some directory in
-### the path.
-ECL_TO_RUN=/usr/bin/ecl
diff --git a/srcpkgs/ecl/files/ppc64-musl.conf b/srcpkgs/ecl/files/ppc64-musl.conf
deleted file mode 100644
index d9aac8d11812..000000000000
--- a/srcpkgs/ecl/files/ppc64-musl.conf
+++ /dev/null
@@ -1,63 +0,0 @@
-###
-### YOU ARE TRYING TO CROSS COMPILE ECL.
-### PLEASE FOLLOW THESE INSTRUCTIONS:
-###
-### 1) Vital information cannot be determined at configuration time
-### because we are not able to run test programs. A file called
-###		
-### has been created, that you will have to fill out. Please do
-### it before invoking "configure" again.
-
-### 1.1) Direction of growth of the stack
-ECL_STACK_DIR=down
-
-### 1.2) Choose an integer datatype which is large enough to host a pointer
-CL_FIXNUM_TYPE="long long int"
-CL_FIXNUM_BITS=64
-CL_FIXNUM_MAX=2305843009213693951LL
-CL_FIXNUM_MIN=-2305843009213693952LL
-CL_INT_BITS=32
-CL_LONG_BITS=64
-
-### 1.3) Order of bytes within a word
-ECL_BIGENDIAN=yes
-
-### 1.4) What characters signal an end of line. May be LF (Linefeed or \n)
-###      CR (Carriage return or \r), and CRLF (CR followed by LF).
-ECL_NEWLINE=LF
-
-### 1.5) Can we guess how many characters are available for reading from
-###      the FILE structure?
-###          0 = no
-###          1 = (f)->_IO_read_end - (f)->_IO_read_ptr
-###          2 = (f)->_r
-###          3 = (f)->_cnt
-ECL_FILE_CNT=0
-
-###
-### 1.6) Other integer types (set to 'no' to disable)
-###
-ECL_STDINT_HEADER="#include <stdint.h>"
-ECL_UINT8_T=uint8_t
-ECL_UINT16_T=uint16_t
-ECL_UINT32_T=uint32_t
-ECL_UINT64_T=uint64_t
-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
-
-###
-### 1.7) Other features (set to 'no' to disable)
-###
-ECL_WORKING_ENVIRON=yes
-
-### 2) To cross-compile ECL so that it runs on the system
-###		powerpc64-unknown-linux-musl
-### you need to first compile ECL on the system in which you are building
-### the cross-compiled files, that is
-###		x86_64-unknown-linux-musl
-### By default we assume that ECL can be accessed from some directory in
-### the path.
-ECL_TO_RUN=/usr/bin/ecl
diff --git a/srcpkgs/ecl/files/ppc64.conf b/srcpkgs/ecl/files/ppc64.conf
deleted file mode 100644
index a47bab0ad9be..000000000000
--- a/srcpkgs/ecl/files/ppc64.conf
+++ /dev/null
@@ -1,63 +0,0 @@
-###
-### YOU ARE TRYING TO CROSS COMPILE ECL.
-### PLEASE FOLLOW THESE INSTRUCTIONS:
-###
-### 1) Vital information cannot be determined at configuration time
-### because we are not able to run test programs. A file called
-###		
-### has been created, that you will have to fill out. Please do
-### it before invoking "configure" again.
-
-### 1.1) Direction of growth of the stack
-ECL_STACK_DIR=down
-
-### 1.2) Choose an integer datatype which is large enough to host a pointer
-CL_FIXNUM_TYPE="long long int"
-CL_FIXNUM_BITS=64
-CL_FIXNUM_MAX=2305843009213693951LL
-CL_FIXNUM_MIN=-2305843009213693952LL
-CL_INT_BITS=32
-CL_LONG_BITS=64
-
-### 1.3) Order of bytes within a word
-ECL_BIGENDIAN=yes
-
-### 1.4) What characters signal an end of line. May be LF (Linefeed or \n)
-###      CR (Carriage return or \r), and CRLF (CR followed by LF).
-ECL_NEWLINE=LF
-
-### 1.5) Can we guess how many characters are available for reading from
-###      the FILE structure?
-###          0 = no
-###          1 = (f)->_IO_read_end - (f)->_IO_read_ptr
-###          2 = (f)->_r
-###          3 = (f)->_cnt
-ECL_FILE_CNT=0
-
-###
-### 1.6) Other integer types (set to 'no' to disable)
-###
-ECL_STDINT_HEADER="#include <stdint.h>"
-ECL_UINT8_T=uint8_t
-ECL_UINT16_T=uint16_t
-ECL_UINT32_T=uint32_t
-ECL_UINT64_T=uint64_t
-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
-
-###
-### 1.7) Other features (set to 'no' to disable)
-###
-ECL_WORKING_ENVIRON=yes
-
-### 2) To cross-compile ECL so that it runs on the system
-###		powerpc64-unknown-linux-gnu
-### you need to first compile ECL on the system in which you are building
-### the cross-compiled files, that is
-###		x86_64-unknown-linux-gnu
-### By default we assume that ECL can be accessed from some directory in
-### the path.
-ECL_TO_RUN=/usr/bin/ecl
diff --git a/srcpkgs/ecl/files/ppc64le-musl.conf b/srcpkgs/ecl/files/ppc64le-musl.conf
deleted file mode 100644
index 3a02a9ae3ffb..000000000000
--- a/srcpkgs/ecl/files/ppc64le-musl.conf
+++ /dev/null
@@ -1,63 +0,0 @@
-###
-### YOU ARE TRYING TO CROSS COMPILE ECL.
-### PLEASE FOLLOW THESE INSTRUCTIONS:
-###
-### 1) Vital information cannot be determined at configuration time
-### because we are not able to run test programs. A file called
-###		
-### has been created, that you will have to fill out. Please do
-### it before invoking "configure" again.
-
-### 1.1) Direction of growth of the stack
-ECL_STACK_DIR=down
-
-### 1.2) Choose an integer datatype which is large enough to host a pointer
-CL_FIXNUM_TYPE="long long int"
-CL_FIXNUM_BITS=64
-CL_FIXNUM_MAX=2305843009213693951LL
-CL_FIXNUM_MIN=-2305843009213693952LL
-CL_INT_BITS=32
-CL_LONG_BITS=64
-
-### 1.3) Order of bytes within a word
-ECL_BIGENDIAN=no
-
-### 1.4) What characters signal an end of line. May be LF (Linefeed or \n)
-###      CR (Carriage return or \r), and CRLF (CR followed by LF).
-ECL_NEWLINE=LF
-
-### 1.5) Can we guess how many characters are available for reading from
-###      the FILE structure?
-###          0 = no
-###          1 = (f)->_IO_read_end - (f)->_IO_read_ptr
-###          2 = (f)->_r
-###          3 = (f)->_cnt
-ECL_FILE_CNT=0
-
-###
-### 1.6) Other integer types (set to 'no' to disable)
-###
-ECL_STDINT_HEADER="#include <stdint.h>"
-ECL_UINT8_T=uint8_t
-ECL_UINT16_T=uint16_t
-ECL_UINT32_T=uint32_t
-ECL_UINT64_T=uint64_t
-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
-
-###
-### 1.7) Other features (set to 'no' to disable)
-###
-ECL_WORKING_ENVIRON=yes
-
-### 2) To cross-compile ECL so that it runs on the system
-###		powerpc64le-unknown-linux-musl
-### you need to first compile ECL on the system in which you are building
-### the cross-compiled files, that is
-###		x86_64-unknown-linux-musl
-### By default we assume that ECL can be accessed from some directory in
-### the path.
-ECL_TO_RUN=/usr/bin/ecl
diff --git a/srcpkgs/ecl/files/ppc64le.conf b/srcpkgs/ecl/files/ppc64le.conf
deleted file mode 100644
index 59b1ad44e998..000000000000
--- a/srcpkgs/ecl/files/ppc64le.conf
+++ /dev/null
@@ -1,63 +0,0 @@
-###
-### YOU ARE TRYING TO CROSS COMPILE ECL.
-### PLEASE FOLLOW THESE INSTRUCTIONS:
-###
-### 1) Vital information cannot be determined at configuration time
-### because we are not able to run test programs. A file called
-###		
-### has been created, that you will have to fill out. Please do
-### it before invoking "configure" again.
-
-### 1.1) Direction of growth of the stack
-ECL_STACK_DIR=down
-
-### 1.2) Choose an integer datatype which is large enough to host a pointer
-CL_FIXNUM_TYPE="long long int"
-CL_FIXNUM_BITS=64
-CL_FIXNUM_MAX=2305843009213693951LL
-CL_FIXNUM_MIN=-2305843009213693952LL
-CL_INT_BITS=32
-CL_LONG_BITS=64
-
-### 1.3) Order of bytes within a word
-ECL_BIGENDIAN=no
-
-### 1.4) What characters signal an end of line. May be LF (Linefeed or \n)
-###      CR (Carriage return or \r), and CRLF (CR followed by LF).
-ECL_NEWLINE=LF
-
-### 1.5) Can we guess how many characters are available for reading from
-###      the FILE structure?
-###          0 = no
-###          1 = (f)->_IO_read_end - (f)->_IO_read_ptr
-###          2 = (f)->_r
-###          3 = (f)->_cnt
-ECL_FILE_CNT=0
-
-###
-### 1.6) Other integer types (set to 'no' to disable)
-###
-ECL_STDINT_HEADER="#include <stdint.h>"
-ECL_UINT8_T=uint8_t
-ECL_UINT16_T=uint16_t
-ECL_UINT32_T=uint32_t
-ECL_UINT64_T=uint64_t
-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
-
-###
-### 1.7) Other features (set to 'no' to disable)
-###
-ECL_WORKING_ENVIRON=yes
-
-### 2) To cross-compile ECL so that it runs on the system
-###		powerpc64le-unknown-linux-gnu
-### you need to first compile ECL on the system in which you are building
-### the cross-compiled files, that is
-###		x86_64-unknown-linux-gnu
-### By default we assume that ECL can be accessed from some directory in
-### the path.
-ECL_TO_RUN=/usr/bin/ecl
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
index c48b835c8d32..9d10af8d573e 100644
--- a/srcpkgs/ecl/patches/fix-math_fenv_h.patch
+++ b/srcpkgs/ecl/patches/fix-math_fenv_h.patch
@@ -1,99 +1,31 @@
 Source: @pullmoll
-Upstream: no
+Upstream: https://gitlab.com/embeddable-common-lisp/ecl/-/issues/653#note_675299471
 Reason: Some architectures do not define all of the FE_.. constants
+Example: mips-musl needs this
 
---- 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/src/h/impl/math_fenv.h b/src/h/impl/math_fenv.h
+index ea13d87b4..2afbb9549 100644
+--- a/src/h/impl/math_fenv.h
++++ b/src/h/impl/math_fenv.h
+@@ -55,6 +55,21 @@
+ #ifdef HAVE_FENV_H
+ # define ECL_WITHOUT_FPE_BEGIN do { fenv_t env; feholdexcept(&env);
+ # define ECL_WITHOUT_FPE_END        fesetenv(&env); } while (0)
++# 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
+ #else
+ # define FE_INVALID 1
+ # define FE_DIVBYZERO 2
diff --git a/srcpkgs/ecl/template b/srcpkgs/ecl/template
index a4e160c15bed..09aac0f1db67 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,10 +13,10 @@ maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 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
 	hostmakedepends+=" ecl"
-	configure_args+=" --with-cross-config=${XBPS_SRCPKGDIR}/ecl/files/${XBPS_TARGET_MACHINE}.conf"
+	configure_args+=" --with-cross-config=${XBPS_SRCPKGDIR}/ecl/files/${XBPS_TARGET_WORDSIZE}${XBPS_TARGET_ENDIAN}.conf"
 fi

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: ecl: update to 21.2.1.
  2021-08-24 23:33 [PR PATCH] ecl: update to 21.2.1 tornaria
                   ` (12 preceding siblings ...)
  2021-09-14 22:49 ` [PR PATCH] [Updated] " tornaria
@ 2021-09-14 22:54 ` tornaria
  2021-09-14 23:09 ` [PR PATCH] [Updated] " tornaria
                   ` (6 subsequent siblings)
  20 siblings, 0 replies; 22+ messages in thread
From: tornaria @ 2021-09-14 22:54 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 601 bytes --]

New comment by tornaria on void-packages repository

https://github.com/void-linux/void-packages/pull/32659#issuecomment-919567266

Comment:
New push:
 - reincluded `fix-math_env_h.patch` in the new version suggested by upstream (https://gitlab.com/embeddable-common-lisp/ecl/-/issues/653#note_675299471)
 - replace the per-arch cross_config files by the 4 different ones `{32,64}{be,le}.conf`. It could also be a template that is substituted in `pre_configure()`, but this seems the easiest way to do it.
 - lint fails just because it doesn't like long lines in the git log message. I will amend.

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [PR PATCH] [Updated] ecl: update to 21.2.1.
  2021-08-24 23:33 [PR PATCH] ecl: update to 21.2.1 tornaria
                   ` (13 preceding siblings ...)
  2021-09-14 22:54 ` tornaria
@ 2021-09-14 23:09 ` tornaria
  2021-09-14 23:12 ` tornaria
                   ` (5 subsequent siblings)
  20 siblings, 0 replies; 22+ messages in thread
From: tornaria @ 2021-09-14 23:09 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 408 bytes --]

There is an updated pull request by tornaria against master on the void-packages repository

https://github.com/tornaria/void-packages ecl
https://github.com/void-linux/void-packages/pull/32659

ecl: update to 21.2.1.
I compiled and doctested sage-9.4 with this PR + other updates and new packages. All working fine.

A patch file from https://github.com/void-linux/void-packages/pull/32659.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ecl-32659.patch --]
[-- Type: text/x-diff, Size: 42176 bytes --]

From 8bacc94036898b06e0c37e843465f3dcf8bfff51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 24 Aug 2021 18:55:59 -0300
Subject: [PATCH] ecl: update to 21.2.1.

Also:
- remove fix-libffi-system.patch (not needed anymore)
- clean-up fix-math_fenv_h.patch
  upstream: https://gitlab.com/embeddable-common-lisp/ecl/-/issues/653#note_675299471
- add long long, int64_t and uint64_t in all the cross_config files;
  compilation fails when long long is enabled in host but disabled in target.
- replace the per-arch cross_config files by 4 generic ones: {32,64}{be,le}.conf
---
 .../ecl/files/{mips-musl.conf => 32be.conf}   |   6 +-
 .../ecl/files/{mipsel-musl.conf => 32le.conf} |   6 +-
 .../files/{aarch64-musl.conf => 64be.conf}    |   4 +-
 .../ecl/files/{x86_64-musl.conf => 64le.conf} |   0
 srcpkgs/ecl/files/aarch64.conf                |  63 ---------
 srcpkgs/ecl/files/armv5tel-musl.conf          |  63 ---------
 srcpkgs/ecl/files/armv5tel.conf               |  63 ---------
 srcpkgs/ecl/files/armv6l-musl.conf            |  63 ---------
 srcpkgs/ecl/files/armv6l.conf                 |  63 ---------
 srcpkgs/ecl/files/armv7l-musl.conf            |  63 ---------
 srcpkgs/ecl/files/armv7l.conf                 |  63 ---------
 srcpkgs/ecl/files/mipselhf-musl.conf          |  63 ---------
 srcpkgs/ecl/files/mipshf-musl.conf            |  63 ---------
 srcpkgs/ecl/files/ppc-musl.conf               |  63 ---------
 srcpkgs/ecl/files/ppc.conf                    |  63 ---------
 srcpkgs/ecl/files/ppc64-musl.conf             |  63 ---------
 srcpkgs/ecl/files/ppc64.conf                  |  63 ---------
 srcpkgs/ecl/files/ppc64le-musl.conf           |  63 ---------
 srcpkgs/ecl/files/ppc64le.conf                |  63 ---------
 srcpkgs/ecl/patches/fix-libffi-system.patch   |  16 ---
 srcpkgs/ecl/patches/fix-math_fenv_h.patch     | 124 ++++--------------
 srcpkgs/ecl/template                          |   8 +-
 22 files changed, 40 insertions(+), 1069 deletions(-)
 rename srcpkgs/ecl/files/{mips-musl.conf => 32be.conf} (96%)
 rename srcpkgs/ecl/files/{mipsel-musl.conf => 32le.conf} (96%)
 rename srcpkgs/ecl/files/{aarch64-musl.conf => 64be.conf} (97%)
 rename srcpkgs/ecl/files/{x86_64-musl.conf => 64le.conf} (100%)
 delete mode 100644 srcpkgs/ecl/files/aarch64.conf
 delete mode 100644 srcpkgs/ecl/files/armv5tel-musl.conf
 delete mode 100644 srcpkgs/ecl/files/armv5tel.conf
 delete mode 100644 srcpkgs/ecl/files/armv6l-musl.conf
 delete mode 100644 srcpkgs/ecl/files/armv6l.conf
 delete mode 100644 srcpkgs/ecl/files/armv7l-musl.conf
 delete mode 100644 srcpkgs/ecl/files/armv7l.conf
 delete mode 100644 srcpkgs/ecl/files/mipselhf-musl.conf
 delete mode 100644 srcpkgs/ecl/files/mipshf-musl.conf
 delete mode 100644 srcpkgs/ecl/files/ppc-musl.conf
 delete mode 100644 srcpkgs/ecl/files/ppc.conf
 delete mode 100644 srcpkgs/ecl/files/ppc64-musl.conf
 delete mode 100644 srcpkgs/ecl/files/ppc64.conf
 delete mode 100644 srcpkgs/ecl/files/ppc64le-musl.conf
 delete mode 100644 srcpkgs/ecl/files/ppc64le.conf
 delete mode 100644 srcpkgs/ecl/patches/fix-libffi-system.patch

diff --git a/srcpkgs/ecl/files/mips-musl.conf b/srcpkgs/ecl/files/32be.conf
similarity index 96%
rename from srcpkgs/ecl/files/mips-musl.conf
rename to srcpkgs/ecl/files/32be.conf
index 2198241b6ed7..dd18eb8e0e57 100644
--- a/srcpkgs/ecl/files/mips-musl.conf
+++ b/srcpkgs/ecl/files/32be.conf
@@ -41,12 +41,12 @@ ECL_STDINT_HEADER="#include <stdint.h>"
 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/32le.conf
similarity index 96%
rename from srcpkgs/ecl/files/mipsel-musl.conf
rename to srcpkgs/ecl/files/32le.conf
index 0b553b267032..c037e1a47891 100644
--- a/srcpkgs/ecl/files/mipsel-musl.conf
+++ b/srcpkgs/ecl/files/32le.conf
@@ -41,12 +41,12 @@ ECL_STDINT_HEADER="#include <stdint.h>"
 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/aarch64-musl.conf b/srcpkgs/ecl/files/64be.conf
similarity index 97%
rename from srcpkgs/ecl/files/aarch64-musl.conf
rename to srcpkgs/ecl/files/64be.conf
index 048053eeb066..3b105d923228 100644
--- a/srcpkgs/ecl/files/aarch64-musl.conf
+++ b/srcpkgs/ecl/files/64be.conf
@@ -20,7 +20,7 @@ CL_INT_BITS=32
 CL_LONG_BITS=64
 
 ### 1.3) Order of bytes within a word
-ECL_BIGENDIAN=no
+ECL_BIGENDIAN=yes
 
 ### 1.4) What characters signal an end of line. May be LF (Linefeed or \n)
 ###      CR (Carriage return or \r), and CRLF (CR followed by LF).
@@ -54,7 +54,7 @@ ECL_LONG_LONG_BITS=64
 ECL_WORKING_ENVIRON=yes
 
 ### 2) To cross-compile ECL so that it runs on the system
-###		aarch64-unknown-linux-gnu
+###		x86_64-unknown-linux-musl
 ### you need to first compile ECL on the system in which you are building
 ### the cross-compiled files, that is
 ###		x86_64-unknown-linux-gnu
diff --git a/srcpkgs/ecl/files/x86_64-musl.conf b/srcpkgs/ecl/files/64le.conf
similarity index 100%
rename from srcpkgs/ecl/files/x86_64-musl.conf
rename to srcpkgs/ecl/files/64le.conf
diff --git a/srcpkgs/ecl/files/aarch64.conf b/srcpkgs/ecl/files/aarch64.conf
deleted file mode 100644
index 048053eeb066..000000000000
--- a/srcpkgs/ecl/files/aarch64.conf
+++ /dev/null
@@ -1,63 +0,0 @@
-###
-### YOU ARE TRYING TO CROSS COMPILE ECL.
-### PLEASE FOLLOW THESE INSTRUCTIONS:
-###
-### 1) Vital information cannot be determined at configuration time
-### because we are not able to run test programs. A file called
-###		
-### has been created, that you will have to fill out. Please do
-### it before invoking "configure" again.
-
-### 1.1) Direction of growth of the stack
-ECL_STACK_DIR=down
-
-### 1.2) Choose an integer datatype which is large enough to host a pointer
-CL_FIXNUM_TYPE="long long int"
-CL_FIXNUM_BITS=64
-CL_FIXNUM_MAX=2305843009213693951LL
-CL_FIXNUM_MIN=-2305843009213693952LL
-CL_INT_BITS=32
-CL_LONG_BITS=64
-
-### 1.3) Order of bytes within a word
-ECL_BIGENDIAN=no
-
-### 1.4) What characters signal an end of line. May be LF (Linefeed or \n)
-###      CR (Carriage return or \r), and CRLF (CR followed by LF).
-ECL_NEWLINE=LF
-
-### 1.5) Can we guess how many characters are available for reading from
-###      the FILE structure?
-###          0 = no
-###          1 = (f)->_IO_read_end - (f)->_IO_read_ptr
-###          2 = (f)->_r
-###          3 = (f)->_cnt
-ECL_FILE_CNT=0
-
-###
-### 1.6) Other integer types (set to 'no' to disable)
-###
-ECL_STDINT_HEADER="#include <stdint.h>"
-ECL_UINT8_T=uint8_t
-ECL_UINT16_T=uint16_t
-ECL_UINT32_T=uint32_t
-ECL_UINT64_T=uint64_t
-ECL_INT8_T=int8_t
-ECL_INT16_T=int16_t
-ECL_INT32_T=int32_t
-ECL_INT64_T=int64_t
-ECL_LONG_LONG_BITS=64
-
-###
-### 1.7) Other features (set to 'no' to disable)
-###
-ECL_WORKING_ENVIRON=yes
-
-### 2) To cross-compile ECL so that it runs on the system
-###		aarch64-unknown-linux-gnu
-### you need to first compile ECL on the system in which you are building
-### the cross-compiled files, that is
-###		x86_64-unknown-linux-gnu
-### By default we assume that ECL can be accessed from some directory in
-### the path.
-ECL_TO_RUN=/usr/bin/ecl
diff --git a/srcpkgs/ecl/files/armv5tel-musl.conf b/srcpkgs/ecl/files/armv5tel-musl.conf
deleted file mode 100644
index b633337b9ff7..000000000000
--- a/srcpkgs/ecl/files/armv5tel-musl.conf
+++ /dev/null
@@ -1,63 +0,0 @@
-###
-### YOU ARE TRYING TO CROSS COMPILE ECL.
-### PLEASE FOLLOW THESE INSTRUCTIONS:
-###
-### 1) Vital information cannot be determined at configuration time
-### because we are not able to run test programs. A file called
-###		
-### has been created, that you will have to fill out. Please do
-### it before invoking "configure" again.
-
-### 1.1) Direction of growth of the stack
-ECL_STACK_DIR=down
-
-### 1.2) Choose an integer datatype which is large enough to host a pointer
-CL_FIXNUM_TYPE=int
-CL_FIXNUM_BITS=32
-CL_FIXNUM_MAX=536870911L
-CL_FIXNUM_MIN=-536870912L
-CL_INT_BITS=32
-CL_LONG_BITS=32
-
-### 1.3) Order of bytes within a word
-ECL_BIGENDIAN=no
-
-### 1.4) What characters signal an end of line. May be LF (Linefeed or \n)
-###      CR (Carriage return or \r), and CRLF (CR followed by LF).
-ECL_NEWLINE=LF
-
-### 1.5) Can we guess how many characters are available for reading from
-###      the FILE structure?
-###          0 = no
-###          1 = (f)->_IO_read_end - (f)->_IO_read_ptr
-###          2 = (f)->_r
-###          3 = (f)->_cnt
-ECL_FILE_CNT=0
-
-###
-### 1.6) Other integer types (set to 'no' to disable)
-###
-ECL_STDINT_HEADER="#include <stdint.h>"
-ECL_UINT8_T=uint8_t
-ECL_UINT16_T=uint16_t
-ECL_UINT32_T=uint32_t
-ECL_UINT64_T=no
-ECL_INT8_T=int8_t
-ECL_INT16_T=int16_t
-ECL_INT32_T=int32_t
-ECL_INT64_T=no
-ECL_LONG_LONG_BITS=no
-
-###
-### 1.7) Other features (set to 'no' to disable)
-###
-ECL_WORKING_ENVIRON=yes
-
-### 2) To cross-compile ECL so that it runs on the system
-###		arm-unknown-linux-musleabi
-### you need to first compile ECL on the system in which you are building
-### the cross-compiled files, that is
-###		i686-pc-linux-musl
-### By default we assume that ECL can be accessed from some directory in
-### the path.
-ECL_TO_RUN=/usr/bin/ecl
diff --git a/srcpkgs/ecl/files/armv5tel.conf b/srcpkgs/ecl/files/armv5tel.conf
deleted file mode 100644
index 6233550c94d9..000000000000
--- a/srcpkgs/ecl/files/armv5tel.conf
+++ /dev/null
@@ -1,63 +0,0 @@
-###
-### YOU ARE TRYING TO CROSS COMPILE ECL.
-### PLEASE FOLLOW THESE INSTRUCTIONS:
-###
-### 1) Vital information cannot be determined at configuration time
-### because we are not able to run test programs. A file called
-###		
-### has been created, that you will have to fill out. Please do
-### it before invoking "configure" again.
-
-### 1.1) Direction of growth of the stack
-ECL_STACK_DIR=down
-
-### 1.2) Choose an integer datatype which is large enough to host a pointer
-CL_FIXNUM_TYPE=int
-CL_FIXNUM_BITS=32
-CL_FIXNUM_MAX=536870911L
-CL_FIXNUM_MIN=-536870912L
-CL_INT_BITS=32
-CL_LONG_BITS=32
-
-### 1.3) Order of bytes within a word
-ECL_BIGENDIAN=no
-
-### 1.4) What characters signal an end of line. May be LF (Linefeed or \n)
-###      CR (Carriage return or \r), and CRLF (CR followed by LF).
-ECL_NEWLINE=LF
-
-### 1.5) Can we guess how many characters are available for reading from
-###      the FILE structure?
-###          0 = no
-###          1 = (f)->_IO_read_end - (f)->_IO_read_ptr
-###          2 = (f)->_r
-###          3 = (f)->_cnt
-ECL_FILE_CNT=0
-
-###
-### 1.6) Other integer types (set to 'no' to disable)
-###
-ECL_STDINT_HEADER="#include <stdint.h>"
-ECL_UINT8_T=uint8_t
-ECL_UINT16_T=uint16_t
-ECL_UINT32_T=uint32_t
-ECL_UINT64_T=no
-ECL_INT8_T=int8_t
-ECL_INT16_T=int16_t
-ECL_INT32_T=int32_t
-ECL_INT64_T=no
-ECL_LONG_LONG_BITS=no
-
-###
-### 1.7) Other features (set to 'no' to disable)
-###
-ECL_WORKING_ENVIRON=yes
-
-### 2) To cross-compile ECL so that it runs on the system
-###		arm-unknown-linux-gnueabi
-### you need to first compile ECL on the system in which you are building
-### the cross-compiled files, that is
-###		i686-pc-linux-gnu
-### By default we assume that ECL can be accessed from some directory in
-### the path.
-ECL_TO_RUN=/usr/bin/ecl
diff --git a/srcpkgs/ecl/files/armv6l-musl.conf b/srcpkgs/ecl/files/armv6l-musl.conf
deleted file mode 100644
index a48cd8bd4d2f..000000000000
--- a/srcpkgs/ecl/files/armv6l-musl.conf
+++ /dev/null
@@ -1,63 +0,0 @@
-###
-### YOU ARE TRYING TO CROSS COMPILE ECL.
-### PLEASE FOLLOW THESE INSTRUCTIONS:
-###
-### 1) Vital information cannot be determined at configuration time
-### because we are not able to run test programs. A file called
-###		
-### has been created, that you will have to fill out. Please do
-### it before invoking "configure" again.
-
-### 1.1) Direction of growth of the stack
-ECL_STACK_DIR=down
-
-### 1.2) Choose an integer datatype which is large enough to host a pointer
-CL_FIXNUM_TYPE=int
-CL_FIXNUM_BITS=32
-CL_FIXNUM_MAX=536870911L
-CL_FIXNUM_MIN=-536870912L
-CL_INT_BITS=32
-CL_LONG_BITS=32
-
-### 1.3) Order of bytes within a word
-ECL_BIGENDIAN=no
-
-### 1.4) What characters signal an end of line. May be LF (Linefeed or \n)
-###      CR (Carriage return or \r), and CRLF (CR followed by LF).
-ECL_NEWLINE=LF
-
-### 1.5) Can we guess how many characters are available for reading from
-###      the FILE structure?
-###          0 = no
-###          1 = (f)->_IO_read_end - (f)->_IO_read_ptr
-###          2 = (f)->_r
-###          3 = (f)->_cnt
-ECL_FILE_CNT=0
-
-###
-### 1.6) Other integer types (set to 'no' to disable)
-###
-ECL_STDINT_HEADER="#include <stdint.h>"
-ECL_UINT8_T=uint8_t
-ECL_UINT16_T=uint16_t
-ECL_UINT32_T=uint32_t
-ECL_UINT64_T=no
-ECL_INT8_T=int8_t
-ECL_INT16_T=int16_t
-ECL_INT32_T=int32_t
-ECL_INT64_T=no
-ECL_LONG_LONG_BITS=no
-
-###
-### 1.7) Other features (set to 'no' to disable)
-###
-ECL_WORKING_ENVIRON=yes
-
-### 2) To cross-compile ECL so that it runs on the system
-###		armv7l-unknown-linux-musleabihf
-### you need to first compile ECL on the system in which you are building
-### the cross-compiled files, that is
-###		x86_64-unknown-linux-gnu
-### By default we assume that ECL can be accessed from some directory in
-### the path.
-ECL_TO_RUN=/usr/bin/ecl
diff --git a/srcpkgs/ecl/files/armv6l.conf b/srcpkgs/ecl/files/armv6l.conf
deleted file mode 100644
index a48cd8bd4d2f..000000000000
--- a/srcpkgs/ecl/files/armv6l.conf
+++ /dev/null
@@ -1,63 +0,0 @@
-###
-### YOU ARE TRYING TO CROSS COMPILE ECL.
-### PLEASE FOLLOW THESE INSTRUCTIONS:
-###
-### 1) Vital information cannot be determined at configuration time
-### because we are not able to run test programs. A file called
-###		
-### has been created, that you will have to fill out. Please do
-### it before invoking "configure" again.
-
-### 1.1) Direction of growth of the stack
-ECL_STACK_DIR=down
-
-### 1.2) Choose an integer datatype which is large enough to host a pointer
-CL_FIXNUM_TYPE=int
-CL_FIXNUM_BITS=32
-CL_FIXNUM_MAX=536870911L
-CL_FIXNUM_MIN=-536870912L
-CL_INT_BITS=32
-CL_LONG_BITS=32
-
-### 1.3) Order of bytes within a word
-ECL_BIGENDIAN=no
-
-### 1.4) What characters signal an end of line. May be LF (Linefeed or \n)
-###      CR (Carriage return or \r), and CRLF (CR followed by LF).
-ECL_NEWLINE=LF
-
-### 1.5) Can we guess how many characters are available for reading from
-###      the FILE structure?
-###          0 = no
-###          1 = (f)->_IO_read_end - (f)->_IO_read_ptr
-###          2 = (f)->_r
-###          3 = (f)->_cnt
-ECL_FILE_CNT=0
-
-###
-### 1.6) Other integer types (set to 'no' to disable)
-###
-ECL_STDINT_HEADER="#include <stdint.h>"
-ECL_UINT8_T=uint8_t
-ECL_UINT16_T=uint16_t
-ECL_UINT32_T=uint32_t
-ECL_UINT64_T=no
-ECL_INT8_T=int8_t
-ECL_INT16_T=int16_t
-ECL_INT32_T=int32_t
-ECL_INT64_T=no
-ECL_LONG_LONG_BITS=no
-
-###
-### 1.7) Other features (set to 'no' to disable)
-###
-ECL_WORKING_ENVIRON=yes
-
-### 2) To cross-compile ECL so that it runs on the system
-###		armv7l-unknown-linux-musleabihf
-### you need to first compile ECL on the system in which you are building
-### the cross-compiled files, that is
-###		x86_64-unknown-linux-gnu
-### By default we assume that ECL can be accessed from some directory in
-### the path.
-ECL_TO_RUN=/usr/bin/ecl
diff --git a/srcpkgs/ecl/files/armv7l-musl.conf b/srcpkgs/ecl/files/armv7l-musl.conf
deleted file mode 100644
index c70a38d248a3..000000000000
--- a/srcpkgs/ecl/files/armv7l-musl.conf
+++ /dev/null
@@ -1,63 +0,0 @@
-###
-### YOU ARE TRYING TO CROSS COMPILE ECL.
-### PLEASE FOLLOW THESE INSTRUCTIONS:
-###
-### 1) Vital information cannot be determined at configuration time
-### because we are not able to run test programs. A file called
-###		
-### has been created, that you will have to fill out. Please do
-### it before invoking "configure" again.
-
-### 1.1) Direction of growth of the stack
-ECL_STACK_DIR=down
-
-### 1.2) Choose an integer datatype which is large enough to host a pointer
-CL_FIXNUM_TYPE=int
-CL_FIXNUM_BITS=32
-CL_FIXNUM_MAX=536870911L
-CL_FIXNUM_MIN=-536870912L
-CL_INT_BITS=32
-CL_LONG_BITS=32
-
-### 1.3) Order of bytes within a word
-ECL_BIGENDIAN=no
-
-### 1.4) What characters signal an end of line. May be LF (Linefeed or \n)
-###      CR (Carriage return or \r), and CRLF (CR followed by LF).
-ECL_NEWLINE=LF
-
-### 1.5) Can we guess how many characters are available for reading from
-###      the FILE structure?
-###          0 = no
-###          1 = (f)->_IO_read_end - (f)->_IO_read_ptr
-###          2 = (f)->_r
-###          3 = (f)->_cnt
-ECL_FILE_CNT=0
-
-###
-### 1.6) Other integer types (set to 'no' to disable)
-###
-ECL_STDINT_HEADER="#include <stdint.h>"
-ECL_UINT8_T=uint8_t
-ECL_UINT16_T=uint16_t
-ECL_UINT32_T=uint32_t
-ECL_UINT64_T=no
-ECL_INT8_T=int8_t
-ECL_INT16_T=int16_t
-ECL_INT32_T=int32_t
-ECL_INT64_T=no
-ECL_LONG_LONG_BITS=no
-
-###
-### 1.7) Other features (set to 'no' to disable)
-###
-ECL_WORKING_ENVIRON=yes
-
-### 2) To cross-compile ECL so that it runs on the system
-###		armv7l-unknown-linux-gnueabihf
-### you need to first compile ECL on the system in which you are building
-### the cross-compiled files, that is
-###		x86_64-unknown-linux-gnu
-### By default we assume that ECL can be accessed from some directory in
-### the path.
-ECL_TO_RUN=/usr/bin/ecl
diff --git a/srcpkgs/ecl/files/armv7l.conf b/srcpkgs/ecl/files/armv7l.conf
deleted file mode 100644
index c70a38d248a3..000000000000
--- a/srcpkgs/ecl/files/armv7l.conf
+++ /dev/null
@@ -1,63 +0,0 @@
-###
-### YOU ARE TRYING TO CROSS COMPILE ECL.
-### PLEASE FOLLOW THESE INSTRUCTIONS:
-###
-### 1) Vital information cannot be determined at configuration time
-### because we are not able to run test programs. A file called
-###		
-### has been created, that you will have to fill out. Please do
-### it before invoking "configure" again.
-
-### 1.1) Direction of growth of the stack
-ECL_STACK_DIR=down
-
-### 1.2) Choose an integer datatype which is large enough to host a pointer
-CL_FIXNUM_TYPE=int
-CL_FIXNUM_BITS=32
-CL_FIXNUM_MAX=536870911L
-CL_FIXNUM_MIN=-536870912L
-CL_INT_BITS=32
-CL_LONG_BITS=32
-
-### 1.3) Order of bytes within a word
-ECL_BIGENDIAN=no
-
-### 1.4) What characters signal an end of line. May be LF (Linefeed or \n)
-###      CR (Carriage return or \r), and CRLF (CR followed by LF).
-ECL_NEWLINE=LF
-
-### 1.5) Can we guess how many characters are available for reading from
-###      the FILE structure?
-###          0 = no
-###          1 = (f)->_IO_read_end - (f)->_IO_read_ptr
-###          2 = (f)->_r
-###          3 = (f)->_cnt
-ECL_FILE_CNT=0
-
-###
-### 1.6) Other integer types (set to 'no' to disable)
-###
-ECL_STDINT_HEADER="#include <stdint.h>"
-ECL_UINT8_T=uint8_t
-ECL_UINT16_T=uint16_t
-ECL_UINT32_T=uint32_t
-ECL_UINT64_T=no
-ECL_INT8_T=int8_t
-ECL_INT16_T=int16_t
-ECL_INT32_T=int32_t
-ECL_INT64_T=no
-ECL_LONG_LONG_BITS=no
-
-###
-### 1.7) Other features (set to 'no' to disable)
-###
-ECL_WORKING_ENVIRON=yes
-
-### 2) To cross-compile ECL so that it runs on the system
-###		armv7l-unknown-linux-gnueabihf
-### you need to first compile ECL on the system in which you are building
-### the cross-compiled files, that is
-###		x86_64-unknown-linux-gnu
-### By default we assume that ECL can be accessed from some directory in
-### the path.
-ECL_TO_RUN=/usr/bin/ecl
diff --git a/srcpkgs/ecl/files/mipselhf-musl.conf b/srcpkgs/ecl/files/mipselhf-musl.conf
deleted file mode 100644
index 0b553b267032..000000000000
--- a/srcpkgs/ecl/files/mipselhf-musl.conf
+++ /dev/null
@@ -1,63 +0,0 @@
-###
-### YOU ARE TRYING TO CROSS COMPILE ECL.
-### PLEASE FOLLOW THESE INSTRUCTIONS:
-###
-### 1) Vital information cannot be determined at configuration time
-### because we are not able to run test programs. A file called
-###		
-### has been created, that you will have to fill out. Please do
-### it before invoking "configure" again.
-
-### 1.1) Direction of growth of the stack
-ECL_STACK_DIR=down
-
-### 1.2) Choose an integer datatype which is large enough to host a pointer
-CL_FIXNUM_TYPE=int
-CL_FIXNUM_BITS=32
-CL_FIXNUM_MAX=536870911L
-CL_FIXNUM_MIN=-536870912L
-CL_INT_BITS=32
-CL_LONG_BITS=32
-
-### 1.3) Order of bytes within a word
-ECL_BIGENDIAN=no
-
-### 1.4) What characters signal an end of line. May be LF (Linefeed or \n)
-###      CR (Carriage return or \r), and CRLF (CR followed by LF).
-ECL_NEWLINE=LF
-
-### 1.5) Can we guess how many characters are available for reading from
-###      the FILE structure?
-###          0 = no
-###          1 = (f)->_IO_read_end - (f)->_IO_read_ptr
-###          2 = (f)->_r
-###          3 = (f)->_cnt
-ECL_FILE_CNT=0
-
-###
-### 1.6) Other integer types (set to 'no' to disable)
-###
-ECL_STDINT_HEADER="#include <stdint.h>"
-ECL_UINT8_T=uint8_t
-ECL_UINT16_T=uint16_t
-ECL_UINT32_T=uint32_t
-ECL_UINT64_T=no
-ECL_INT8_T=int8_t
-ECL_INT16_T=int16_t
-ECL_INT32_T=int32_t
-ECL_INT64_T=no
-ECL_LONG_LONG_BITS=no
-
-###
-### 1.7) Other features (set to 'no' to disable)
-###
-ECL_WORKING_ENVIRON=yes
-
-### 2) To cross-compile ECL so that it runs on the system
-###		mips-unknown-linux-musl
-### you need to first compile ECL on the system in which you are building
-### the cross-compiled files, that is
-###		x86_64-unknown-linux-gnu
-### By default we assume that ECL can be accessed from some directory in
-### the path.
-ECL_TO_RUN=/usr/bin/ecl
diff --git a/srcpkgs/ecl/files/mipshf-musl.conf b/srcpkgs/ecl/files/mipshf-musl.conf
deleted file mode 100644
index 2198241b6ed7..000000000000
--- a/srcpkgs/ecl/files/mipshf-musl.conf
+++ /dev/null
@@ -1,63 +0,0 @@
-###
-### YOU ARE TRYING TO CROSS COMPILE ECL.
-### PLEASE FOLLOW THESE INSTRUCTIONS:
-###
-### 1) Vital information cannot be determined at configuration time
-### because we are not able to run test programs. A file called
-###		
-### has been created, that you will have to fill out. Please do
-### it before invoking "configure" again.
-
-### 1.1) Direction of growth of the stack
-ECL_STACK_DIR=down
-
-### 1.2) Choose an integer datatype which is large enough to host a pointer
-CL_FIXNUM_TYPE=int
-CL_FIXNUM_BITS=32
-CL_FIXNUM_MAX=536870911L
-CL_FIXNUM_MIN=-536870912L
-CL_INT_BITS=32
-CL_LONG_BITS=32
-
-### 1.3) Order of bytes within a word
-ECL_BIGENDIAN=yes
-
-### 1.4) What characters signal an end of line. May be LF (Linefeed or \n)
-###      CR (Carriage return or \r), and CRLF (CR followed by LF).
-ECL_NEWLINE=LF
-
-### 1.5) Can we guess how many characters are available for reading from
-###      the FILE structure?
-###          0 = no
-###          1 = (f)->_IO_read_end - (f)->_IO_read_ptr
-###          2 = (f)->_r
-###          3 = (f)->_cnt
-ECL_FILE_CNT=0
-
-###
-### 1.6) Other integer types (set to 'no' to disable)
-###
-ECL_STDINT_HEADER="#include <stdint.h>"
-ECL_UINT8_T=uint8_t
-ECL_UINT16_T=uint16_t
-ECL_UINT32_T=uint32_t
-ECL_UINT64_T=no
-ECL_INT8_T=int8_t
-ECL_INT16_T=int16_t
-ECL_INT32_T=int32_t
-ECL_INT64_T=no
-ECL_LONG_LONG_BITS=no
-
-###
-### 1.7) Other features (set to 'no' to disable)
-###
-ECL_WORKING_ENVIRON=yes
-
-### 2) To cross-compile ECL so that it runs on the system
-###		mips-unknown-linux-musl
-### you need to first compile ECL on the system in which you are building
-### the cross-compiled files, that is
-###		x86_64-unknown-linux-gnu
-### By default we assume that ECL can be accessed from some directory in
-### the path.
-ECL_TO_RUN=/usr/bin/ecl
diff --git a/srcpkgs/ecl/files/ppc-musl.conf b/srcpkgs/ecl/files/ppc-musl.conf
deleted file mode 100644
index cdca29e1d613..000000000000
--- a/srcpkgs/ecl/files/ppc-musl.conf
+++ /dev/null
@@ -1,63 +0,0 @@
-###
-### YOU ARE TRYING TO CROSS COMPILE ECL.
-### PLEASE FOLLOW THESE INSTRUCTIONS:
-###
-### 1) Vital information cannot be determined at configuration time
-### because we are not able to run test programs. A file called
-###		
-### has been created, that you will have to fill out. Please do
-### it before invoking "configure" again.
-
-### 1.1) Direction of growth of the stack
-ECL_STACK_DIR=down
-
-### 1.2) Choose an integer datatype which is large enough to host a pointer
-CL_FIXNUM_TYPE=int
-CL_FIXNUM_BITS=32
-CL_FIXNUM_MAX=536870911L
-CL_FIXNUM_MIN=-536870912L
-CL_INT_BITS=32
-CL_LONG_BITS=32
-
-### 1.3) Order of bytes within a word
-ECL_BIGENDIAN=yes
-
-### 1.4) What characters signal an end of line. May be LF (Linefeed or \n)
-###      CR (Carriage return or \r), and CRLF (CR followed by LF).
-ECL_NEWLINE=LF
-
-### 1.5) Can we guess how many characters are available for reading from
-###      the FILE structure?
-###          0 = no
-###          1 = (f)->_IO_read_end - (f)->_IO_read_ptr
-###          2 = (f)->_r
-###          3 = (f)->_cnt
-ECL_FILE_CNT=0
-
-###
-### 1.6) Other integer types (set to 'no' to disable)
-###
-ECL_STDINT_HEADER="#include <stdint.h>"
-ECL_UINT8_T=uint8_t
-ECL_UINT16_T=uint16_t
-ECL_UINT32_T=uint32_t
-ECL_UINT64_T=no
-ECL_INT8_T=int8_t
-ECL_INT16_T=int16_t
-ECL_INT32_T=int32_t
-ECL_INT64_T=no
-ECL_LONG_LONG_BITS=no
-
-###
-### 1.7) Other features (set to 'no' to disable)
-###
-ECL_WORKING_ENVIRON=yes
-
-### 2) To cross-compile ECL so that it runs on the system
-###		powerpc-unknown-linux-musl
-### you need to first compile ECL on the system in which you are building
-### the cross-compiled files, that is
-###		i686-pc-linux-musl
-### By default we assume that ECL can be accessed from some directory in
-### the path.
-ECL_TO_RUN=/usr/bin/ecl
diff --git a/srcpkgs/ecl/files/ppc.conf b/srcpkgs/ecl/files/ppc.conf
deleted file mode 100644
index 8c5c3d1bb4d3..000000000000
--- a/srcpkgs/ecl/files/ppc.conf
+++ /dev/null
@@ -1,63 +0,0 @@
-###
-### YOU ARE TRYING TO CROSS COMPILE ECL.
-### PLEASE FOLLOW THESE INSTRUCTIONS:
-###
-### 1) Vital information cannot be determined at configuration time
-### because we are not able to run test programs. A file called
-###		
-### has been created, that you will have to fill out. Please do
-### it before invoking "configure" again.
-
-### 1.1) Direction of growth of the stack
-ECL_STACK_DIR=down
-
-### 1.2) Choose an integer datatype which is large enough to host a pointer
-CL_FIXNUM_TYPE=int
-CL_FIXNUM_BITS=32
-CL_FIXNUM_MAX=536870911L
-CL_FIXNUM_MIN=-536870912L
-CL_INT_BITS=32
-CL_LONG_BITS=32
-
-### 1.3) Order of bytes within a word
-ECL_BIGENDIAN=yes
-
-### 1.4) What characters signal an end of line. May be LF (Linefeed or \n)
-###      CR (Carriage return or \r), and CRLF (CR followed by LF).
-ECL_NEWLINE=LF
-
-### 1.5) Can we guess how many characters are available for reading from
-###      the FILE structure?
-###          0 = no
-###          1 = (f)->_IO_read_end - (f)->_IO_read_ptr
-###          2 = (f)->_r
-###          3 = (f)->_cnt
-ECL_FILE_CNT=0
-
-###
-### 1.6) Other integer types (set to 'no' to disable)
-###
-ECL_STDINT_HEADER="#include <stdint.h>"
-ECL_UINT8_T=uint8_t
-ECL_UINT16_T=uint16_t
-ECL_UINT32_T=uint32_t
-ECL_UINT64_T=no
-ECL_INT8_T=int8_t
-ECL_INT16_T=int16_t
-ECL_INT32_T=int32_t
-ECL_INT64_T=no
-ECL_LONG_LONG_BITS=no
-
-###
-### 1.7) Other features (set to 'no' to disable)
-###
-ECL_WORKING_ENVIRON=yes
-
-### 2) To cross-compile ECL so that it runs on the system
-###		powerpc-unknown-linux-gnu
-### you need to first compile ECL on the system in which you are building
-### the cross-compiled files, that is
-###		i686-pc-linux-gnu
-### By default we assume that ECL can be accessed from some directory in
-### the path.
-ECL_TO_RUN=/usr/bin/ecl
diff --git a/srcpkgs/ecl/files/ppc64-musl.conf b/srcpkgs/ecl/files/ppc64-musl.conf
deleted file mode 100644
index d9aac8d11812..000000000000
--- a/srcpkgs/ecl/files/ppc64-musl.conf
+++ /dev/null
@@ -1,63 +0,0 @@
-###
-### YOU ARE TRYING TO CROSS COMPILE ECL.
-### PLEASE FOLLOW THESE INSTRUCTIONS:
-###
-### 1) Vital information cannot be determined at configuration time
-### because we are not able to run test programs. A file called
-###		
-### has been created, that you will have to fill out. Please do
-### it before invoking "configure" again.
-
-### 1.1) Direction of growth of the stack
-ECL_STACK_DIR=down
-
-### 1.2) Choose an integer datatype which is large enough to host a pointer
-CL_FIXNUM_TYPE="long long int"
-CL_FIXNUM_BITS=64
-CL_FIXNUM_MAX=2305843009213693951LL
-CL_FIXNUM_MIN=-2305843009213693952LL
-CL_INT_BITS=32
-CL_LONG_BITS=64
-
-### 1.3) Order of bytes within a word
-ECL_BIGENDIAN=yes
-
-### 1.4) What characters signal an end of line. May be LF (Linefeed or \n)
-###      CR (Carriage return or \r), and CRLF (CR followed by LF).
-ECL_NEWLINE=LF
-
-### 1.5) Can we guess how many characters are available for reading from
-###      the FILE structure?
-###          0 = no
-###          1 = (f)->_IO_read_end - (f)->_IO_read_ptr
-###          2 = (f)->_r
-###          3 = (f)->_cnt
-ECL_FILE_CNT=0
-
-###
-### 1.6) Other integer types (set to 'no' to disable)
-###
-ECL_STDINT_HEADER="#include <stdint.h>"
-ECL_UINT8_T=uint8_t
-ECL_UINT16_T=uint16_t
-ECL_UINT32_T=uint32_t
-ECL_UINT64_T=uint64_t
-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
-
-###
-### 1.7) Other features (set to 'no' to disable)
-###
-ECL_WORKING_ENVIRON=yes
-
-### 2) To cross-compile ECL so that it runs on the system
-###		powerpc64-unknown-linux-musl
-### you need to first compile ECL on the system in which you are building
-### the cross-compiled files, that is
-###		x86_64-unknown-linux-musl
-### By default we assume that ECL can be accessed from some directory in
-### the path.
-ECL_TO_RUN=/usr/bin/ecl
diff --git a/srcpkgs/ecl/files/ppc64.conf b/srcpkgs/ecl/files/ppc64.conf
deleted file mode 100644
index a47bab0ad9be..000000000000
--- a/srcpkgs/ecl/files/ppc64.conf
+++ /dev/null
@@ -1,63 +0,0 @@
-###
-### YOU ARE TRYING TO CROSS COMPILE ECL.
-### PLEASE FOLLOW THESE INSTRUCTIONS:
-###
-### 1) Vital information cannot be determined at configuration time
-### because we are not able to run test programs. A file called
-###		
-### has been created, that you will have to fill out. Please do
-### it before invoking "configure" again.
-
-### 1.1) Direction of growth of the stack
-ECL_STACK_DIR=down
-
-### 1.2) Choose an integer datatype which is large enough to host a pointer
-CL_FIXNUM_TYPE="long long int"
-CL_FIXNUM_BITS=64
-CL_FIXNUM_MAX=2305843009213693951LL
-CL_FIXNUM_MIN=-2305843009213693952LL
-CL_INT_BITS=32
-CL_LONG_BITS=64
-
-### 1.3) Order of bytes within a word
-ECL_BIGENDIAN=yes
-
-### 1.4) What characters signal an end of line. May be LF (Linefeed or \n)
-###      CR (Carriage return or \r), and CRLF (CR followed by LF).
-ECL_NEWLINE=LF
-
-### 1.5) Can we guess how many characters are available for reading from
-###      the FILE structure?
-###          0 = no
-###          1 = (f)->_IO_read_end - (f)->_IO_read_ptr
-###          2 = (f)->_r
-###          3 = (f)->_cnt
-ECL_FILE_CNT=0
-
-###
-### 1.6) Other integer types (set to 'no' to disable)
-###
-ECL_STDINT_HEADER="#include <stdint.h>"
-ECL_UINT8_T=uint8_t
-ECL_UINT16_T=uint16_t
-ECL_UINT32_T=uint32_t
-ECL_UINT64_T=uint64_t
-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
-
-###
-### 1.7) Other features (set to 'no' to disable)
-###
-ECL_WORKING_ENVIRON=yes
-
-### 2) To cross-compile ECL so that it runs on the system
-###		powerpc64-unknown-linux-gnu
-### you need to first compile ECL on the system in which you are building
-### the cross-compiled files, that is
-###		x86_64-unknown-linux-gnu
-### By default we assume that ECL can be accessed from some directory in
-### the path.
-ECL_TO_RUN=/usr/bin/ecl
diff --git a/srcpkgs/ecl/files/ppc64le-musl.conf b/srcpkgs/ecl/files/ppc64le-musl.conf
deleted file mode 100644
index 3a02a9ae3ffb..000000000000
--- a/srcpkgs/ecl/files/ppc64le-musl.conf
+++ /dev/null
@@ -1,63 +0,0 @@
-###
-### YOU ARE TRYING TO CROSS COMPILE ECL.
-### PLEASE FOLLOW THESE INSTRUCTIONS:
-###
-### 1) Vital information cannot be determined at configuration time
-### because we are not able to run test programs. A file called
-###		
-### has been created, that you will have to fill out. Please do
-### it before invoking "configure" again.
-
-### 1.1) Direction of growth of the stack
-ECL_STACK_DIR=down
-
-### 1.2) Choose an integer datatype which is large enough to host a pointer
-CL_FIXNUM_TYPE="long long int"
-CL_FIXNUM_BITS=64
-CL_FIXNUM_MAX=2305843009213693951LL
-CL_FIXNUM_MIN=-2305843009213693952LL
-CL_INT_BITS=32
-CL_LONG_BITS=64
-
-### 1.3) Order of bytes within a word
-ECL_BIGENDIAN=no
-
-### 1.4) What characters signal an end of line. May be LF (Linefeed or \n)
-###      CR (Carriage return or \r), and CRLF (CR followed by LF).
-ECL_NEWLINE=LF
-
-### 1.5) Can we guess how many characters are available for reading from
-###      the FILE structure?
-###          0 = no
-###          1 = (f)->_IO_read_end - (f)->_IO_read_ptr
-###          2 = (f)->_r
-###          3 = (f)->_cnt
-ECL_FILE_CNT=0
-
-###
-### 1.6) Other integer types (set to 'no' to disable)
-###
-ECL_STDINT_HEADER="#include <stdint.h>"
-ECL_UINT8_T=uint8_t
-ECL_UINT16_T=uint16_t
-ECL_UINT32_T=uint32_t
-ECL_UINT64_T=uint64_t
-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
-
-###
-### 1.7) Other features (set to 'no' to disable)
-###
-ECL_WORKING_ENVIRON=yes
-
-### 2) To cross-compile ECL so that it runs on the system
-###		powerpc64le-unknown-linux-musl
-### you need to first compile ECL on the system in which you are building
-### the cross-compiled files, that is
-###		x86_64-unknown-linux-musl
-### By default we assume that ECL can be accessed from some directory in
-### the path.
-ECL_TO_RUN=/usr/bin/ecl
diff --git a/srcpkgs/ecl/files/ppc64le.conf b/srcpkgs/ecl/files/ppc64le.conf
deleted file mode 100644
index 59b1ad44e998..000000000000
--- a/srcpkgs/ecl/files/ppc64le.conf
+++ /dev/null
@@ -1,63 +0,0 @@
-###
-### YOU ARE TRYING TO CROSS COMPILE ECL.
-### PLEASE FOLLOW THESE INSTRUCTIONS:
-###
-### 1) Vital information cannot be determined at configuration time
-### because we are not able to run test programs. A file called
-###		
-### has been created, that you will have to fill out. Please do
-### it before invoking "configure" again.
-
-### 1.1) Direction of growth of the stack
-ECL_STACK_DIR=down
-
-### 1.2) Choose an integer datatype which is large enough to host a pointer
-CL_FIXNUM_TYPE="long long int"
-CL_FIXNUM_BITS=64
-CL_FIXNUM_MAX=2305843009213693951LL
-CL_FIXNUM_MIN=-2305843009213693952LL
-CL_INT_BITS=32
-CL_LONG_BITS=64
-
-### 1.3) Order of bytes within a word
-ECL_BIGENDIAN=no
-
-### 1.4) What characters signal an end of line. May be LF (Linefeed or \n)
-###      CR (Carriage return or \r), and CRLF (CR followed by LF).
-ECL_NEWLINE=LF
-
-### 1.5) Can we guess how many characters are available for reading from
-###      the FILE structure?
-###          0 = no
-###          1 = (f)->_IO_read_end - (f)->_IO_read_ptr
-###          2 = (f)->_r
-###          3 = (f)->_cnt
-ECL_FILE_CNT=0
-
-###
-### 1.6) Other integer types (set to 'no' to disable)
-###
-ECL_STDINT_HEADER="#include <stdint.h>"
-ECL_UINT8_T=uint8_t
-ECL_UINT16_T=uint16_t
-ECL_UINT32_T=uint32_t
-ECL_UINT64_T=uint64_t
-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
-
-###
-### 1.7) Other features (set to 'no' to disable)
-###
-ECL_WORKING_ENVIRON=yes
-
-### 2) To cross-compile ECL so that it runs on the system
-###		powerpc64le-unknown-linux-gnu
-### you need to first compile ECL on the system in which you are building
-### the cross-compiled files, that is
-###		x86_64-unknown-linux-gnu
-### By default we assume that ECL can be accessed from some directory in
-### the path.
-ECL_TO_RUN=/usr/bin/ecl
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
index c48b835c8d32..9d10af8d573e 100644
--- a/srcpkgs/ecl/patches/fix-math_fenv_h.patch
+++ b/srcpkgs/ecl/patches/fix-math_fenv_h.patch
@@ -1,99 +1,31 @@
 Source: @pullmoll
-Upstream: no
+Upstream: https://gitlab.com/embeddable-common-lisp/ecl/-/issues/653#note_675299471
 Reason: Some architectures do not define all of the FE_.. constants
+Example: mips-musl needs this
 
---- 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/src/h/impl/math_fenv.h b/src/h/impl/math_fenv.h
+index ea13d87b4..2afbb9549 100644
+--- a/src/h/impl/math_fenv.h
++++ b/src/h/impl/math_fenv.h
+@@ -55,6 +55,21 @@
+ #ifdef HAVE_FENV_H
+ # define ECL_WITHOUT_FPE_BEGIN do { fenv_t env; feholdexcept(&env);
+ # define ECL_WITHOUT_FPE_END        fesetenv(&env); } while (0)
++# 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
+ #else
+ # define FE_INVALID 1
+ # define FE_DIVBYZERO 2
diff --git a/srcpkgs/ecl/template b/srcpkgs/ecl/template
index a4e160c15bed..09aac0f1db67 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,10 +13,10 @@ maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 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
 	hostmakedepends+=" ecl"
-	configure_args+=" --with-cross-config=${XBPS_SRCPKGDIR}/ecl/files/${XBPS_TARGET_MACHINE}.conf"
+	configure_args+=" --with-cross-config=${XBPS_SRCPKGDIR}/ecl/files/${XBPS_TARGET_WORDSIZE}${XBPS_TARGET_ENDIAN}.conf"
 fi

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: ecl: update to 21.2.1.
  2021-08-24 23:33 [PR PATCH] ecl: update to 21.2.1 tornaria
                   ` (14 preceding siblings ...)
  2021-09-14 23:09 ` [PR PATCH] [Updated] " tornaria
@ 2021-09-14 23:12 ` tornaria
  2021-09-14 23:13 ` tornaria
                   ` (4 subsequent siblings)
  20 siblings, 0 replies; 22+ messages in thread
From: tornaria @ 2021-09-14 23:12 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 436 bytes --]

New comment by tornaria on void-packages repository

https://github.com/void-linux/void-packages/pull/32659#issuecomment-919575375

Comment:
I batch-tested cross-compiling for all of these
```
aarch64
aarch64-musl
armv5tel
armv5tel-musl
armv6l
armv6l-musl
armv7l
armv7l-musl
i686
i686-musl
mips-musl
mipsel-musl
mipselhf-musl
mipshf-musl
ppc
ppc-musl
ppc64
ppc64-musl
ppc64le
ppc64le-musl
x86_64
x86_64-musl
```

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: ecl: update to 21.2.1.
  2021-08-24 23:33 [PR PATCH] ecl: update to 21.2.1 tornaria
                   ` (15 preceding siblings ...)
  2021-09-14 23:12 ` tornaria
@ 2021-09-14 23:13 ` tornaria
  2021-09-15  2:18 ` [PR PATCH] [Updated] " tornaria
                   ` (3 subsequent siblings)
  20 siblings, 0 replies; 22+ messages in thread
From: tornaria @ 2021-09-14 23:13 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 171 bytes --]

New comment by tornaria on void-packages repository

https://github.com/void-linux/void-packages/pull/32659#issuecomment-919575637

Comment:
Ping @knusbaum: any comments?

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [PR PATCH] [Updated] ecl: update to 21.2.1.
  2021-08-24 23:33 [PR PATCH] ecl: update to 21.2.1 tornaria
                   ` (16 preceding siblings ...)
  2021-09-14 23:13 ` tornaria
@ 2021-09-15  2:18 ` tornaria
  2021-09-16  0:29 ` knusbaum
                   ` (2 subsequent siblings)
  20 siblings, 0 replies; 22+ messages in thread
From: tornaria @ 2021-09-15  2:18 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 408 bytes --]

There is an updated pull request by tornaria against master on the void-packages repository

https://github.com/tornaria/void-packages ecl
https://github.com/void-linux/void-packages/pull/32659

ecl: update to 21.2.1.
I compiled and doctested sage-9.4 with this PR + other updates and new packages. All working fine.

A patch file from https://github.com/void-linux/void-packages/pull/32659.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ecl-32659.patch --]
[-- Type: text/x-diff, Size: 47127 bytes --]

From 14b881d8e814ee8cdd9c9f88529c48ecbd718814 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 24 Aug 2021 18:55:59 -0300
Subject: [PATCH] ecl: update to 21.2.1.

Also:
- remove fix-libffi-system.patch (not needed anymore)
- clean-up fix-math_fenv_h.patch
  upstream: https://gitlab.com/embeddable-common-lisp/ecl/-/issues/653#note_675299471
- add long long, int64_t and uint64_t in all the cross_config files;
  compilation fails when long long is enabled in host but disabled in target.
- replace the per-arch cross_config files by a single one, which is
  conditional on $XBPS_TARGET_WORDSIZE and $XBPS_TARGET_ENDIAN.
---
 srcpkgs/ecl/files/aarch64-musl.conf           |  63 ---------
 srcpkgs/ecl/files/aarch64.conf                |  63 ---------
 srcpkgs/ecl/files/armv5tel-musl.conf          |  63 ---------
 srcpkgs/ecl/files/armv5tel.conf               |  63 ---------
 srcpkgs/ecl/files/armv6l-musl.conf            |  63 ---------
 srcpkgs/ecl/files/armv6l.conf                 |  63 ---------
 srcpkgs/ecl/files/armv7l-musl.conf            |  63 ---------
 srcpkgs/ecl/files/armv7l.conf                 |  63 ---------
 .../files/{x86_64-musl.conf => cross_config}  |  27 +++-
 srcpkgs/ecl/files/mips-musl.conf              |  63 ---------
 srcpkgs/ecl/files/mipsel-musl.conf            |  63 ---------
 srcpkgs/ecl/files/mipselhf-musl.conf          |  63 ---------
 srcpkgs/ecl/files/mipshf-musl.conf            |  63 ---------
 srcpkgs/ecl/files/ppc-musl.conf               |  63 ---------
 srcpkgs/ecl/files/ppc.conf                    |  63 ---------
 srcpkgs/ecl/files/ppc64-musl.conf             |  63 ---------
 srcpkgs/ecl/files/ppc64.conf                  |  63 ---------
 srcpkgs/ecl/files/ppc64le-musl.conf           |  63 ---------
 srcpkgs/ecl/files/ppc64le.conf                |  63 ---------
 srcpkgs/ecl/patches/fix-libffi-system.patch   |  16 ---
 srcpkgs/ecl/patches/fix-math_fenv_h.patch     | 124 ++++--------------
 srcpkgs/ecl/template                          |   8 +-
 22 files changed, 52 insertions(+), 1257 deletions(-)
 delete mode 100644 srcpkgs/ecl/files/aarch64-musl.conf
 delete mode 100644 srcpkgs/ecl/files/aarch64.conf
 delete mode 100644 srcpkgs/ecl/files/armv5tel-musl.conf
 delete mode 100644 srcpkgs/ecl/files/armv5tel.conf
 delete mode 100644 srcpkgs/ecl/files/armv6l-musl.conf
 delete mode 100644 srcpkgs/ecl/files/armv6l.conf
 delete mode 100644 srcpkgs/ecl/files/armv7l-musl.conf
 delete mode 100644 srcpkgs/ecl/files/armv7l.conf
 rename srcpkgs/ecl/files/{x86_64-musl.conf => cross_config} (79%)
 delete mode 100644 srcpkgs/ecl/files/mips-musl.conf
 delete mode 100644 srcpkgs/ecl/files/mipsel-musl.conf
 delete mode 100644 srcpkgs/ecl/files/mipselhf-musl.conf
 delete mode 100644 srcpkgs/ecl/files/mipshf-musl.conf
 delete mode 100644 srcpkgs/ecl/files/ppc-musl.conf
 delete mode 100644 srcpkgs/ecl/files/ppc.conf
 delete mode 100644 srcpkgs/ecl/files/ppc64-musl.conf
 delete mode 100644 srcpkgs/ecl/files/ppc64.conf
 delete mode 100644 srcpkgs/ecl/files/ppc64le-musl.conf
 delete mode 100644 srcpkgs/ecl/files/ppc64le.conf
 delete mode 100644 srcpkgs/ecl/patches/fix-libffi-system.patch

diff --git a/srcpkgs/ecl/files/aarch64-musl.conf b/srcpkgs/ecl/files/aarch64-musl.conf
deleted file mode 100644
index 048053eeb066..000000000000
--- a/srcpkgs/ecl/files/aarch64-musl.conf
+++ /dev/null
@@ -1,63 +0,0 @@
-###
-### YOU ARE TRYING TO CROSS COMPILE ECL.
-### PLEASE FOLLOW THESE INSTRUCTIONS:
-###
-### 1) Vital information cannot be determined at configuration time
-### because we are not able to run test programs. A file called
-###		
-### has been created, that you will have to fill out. Please do
-### it before invoking "configure" again.
-
-### 1.1) Direction of growth of the stack
-ECL_STACK_DIR=down
-
-### 1.2) Choose an integer datatype which is large enough to host a pointer
-CL_FIXNUM_TYPE="long long int"
-CL_FIXNUM_BITS=64
-CL_FIXNUM_MAX=2305843009213693951LL
-CL_FIXNUM_MIN=-2305843009213693952LL
-CL_INT_BITS=32
-CL_LONG_BITS=64
-
-### 1.3) Order of bytes within a word
-ECL_BIGENDIAN=no
-
-### 1.4) What characters signal an end of line. May be LF (Linefeed or \n)
-###      CR (Carriage return or \r), and CRLF (CR followed by LF).
-ECL_NEWLINE=LF
-
-### 1.5) Can we guess how many characters are available for reading from
-###      the FILE structure?
-###          0 = no
-###          1 = (f)->_IO_read_end - (f)->_IO_read_ptr
-###          2 = (f)->_r
-###          3 = (f)->_cnt
-ECL_FILE_CNT=0
-
-###
-### 1.6) Other integer types (set to 'no' to disable)
-###
-ECL_STDINT_HEADER="#include <stdint.h>"
-ECL_UINT8_T=uint8_t
-ECL_UINT16_T=uint16_t
-ECL_UINT32_T=uint32_t
-ECL_UINT64_T=uint64_t
-ECL_INT8_T=int8_t
-ECL_INT16_T=int16_t
-ECL_INT32_T=int32_t
-ECL_INT64_T=int64_t
-ECL_LONG_LONG_BITS=64
-
-###
-### 1.7) Other features (set to 'no' to disable)
-###
-ECL_WORKING_ENVIRON=yes
-
-### 2) To cross-compile ECL so that it runs on the system
-###		aarch64-unknown-linux-gnu
-### you need to first compile ECL on the system in which you are building
-### the cross-compiled files, that is
-###		x86_64-unknown-linux-gnu
-### By default we assume that ECL can be accessed from some directory in
-### the path.
-ECL_TO_RUN=/usr/bin/ecl
diff --git a/srcpkgs/ecl/files/aarch64.conf b/srcpkgs/ecl/files/aarch64.conf
deleted file mode 100644
index 048053eeb066..000000000000
--- a/srcpkgs/ecl/files/aarch64.conf
+++ /dev/null
@@ -1,63 +0,0 @@
-###
-### YOU ARE TRYING TO CROSS COMPILE ECL.
-### PLEASE FOLLOW THESE INSTRUCTIONS:
-###
-### 1) Vital information cannot be determined at configuration time
-### because we are not able to run test programs. A file called
-###		
-### has been created, that you will have to fill out. Please do
-### it before invoking "configure" again.
-
-### 1.1) Direction of growth of the stack
-ECL_STACK_DIR=down
-
-### 1.2) Choose an integer datatype which is large enough to host a pointer
-CL_FIXNUM_TYPE="long long int"
-CL_FIXNUM_BITS=64
-CL_FIXNUM_MAX=2305843009213693951LL
-CL_FIXNUM_MIN=-2305843009213693952LL
-CL_INT_BITS=32
-CL_LONG_BITS=64
-
-### 1.3) Order of bytes within a word
-ECL_BIGENDIAN=no
-
-### 1.4) What characters signal an end of line. May be LF (Linefeed or \n)
-###      CR (Carriage return or \r), and CRLF (CR followed by LF).
-ECL_NEWLINE=LF
-
-### 1.5) Can we guess how many characters are available for reading from
-###      the FILE structure?
-###          0 = no
-###          1 = (f)->_IO_read_end - (f)->_IO_read_ptr
-###          2 = (f)->_r
-###          3 = (f)->_cnt
-ECL_FILE_CNT=0
-
-###
-### 1.6) Other integer types (set to 'no' to disable)
-###
-ECL_STDINT_HEADER="#include <stdint.h>"
-ECL_UINT8_T=uint8_t
-ECL_UINT16_T=uint16_t
-ECL_UINT32_T=uint32_t
-ECL_UINT64_T=uint64_t
-ECL_INT8_T=int8_t
-ECL_INT16_T=int16_t
-ECL_INT32_T=int32_t
-ECL_INT64_T=int64_t
-ECL_LONG_LONG_BITS=64
-
-###
-### 1.7) Other features (set to 'no' to disable)
-###
-ECL_WORKING_ENVIRON=yes
-
-### 2) To cross-compile ECL so that it runs on the system
-###		aarch64-unknown-linux-gnu
-### you need to first compile ECL on the system in which you are building
-### the cross-compiled files, that is
-###		x86_64-unknown-linux-gnu
-### By default we assume that ECL can be accessed from some directory in
-### the path.
-ECL_TO_RUN=/usr/bin/ecl
diff --git a/srcpkgs/ecl/files/armv5tel-musl.conf b/srcpkgs/ecl/files/armv5tel-musl.conf
deleted file mode 100644
index b633337b9ff7..000000000000
--- a/srcpkgs/ecl/files/armv5tel-musl.conf
+++ /dev/null
@@ -1,63 +0,0 @@
-###
-### YOU ARE TRYING TO CROSS COMPILE ECL.
-### PLEASE FOLLOW THESE INSTRUCTIONS:
-###
-### 1) Vital information cannot be determined at configuration time
-### because we are not able to run test programs. A file called
-###		
-### has been created, that you will have to fill out. Please do
-### it before invoking "configure" again.
-
-### 1.1) Direction of growth of the stack
-ECL_STACK_DIR=down
-
-### 1.2) Choose an integer datatype which is large enough to host a pointer
-CL_FIXNUM_TYPE=int
-CL_FIXNUM_BITS=32
-CL_FIXNUM_MAX=536870911L
-CL_FIXNUM_MIN=-536870912L
-CL_INT_BITS=32
-CL_LONG_BITS=32
-
-### 1.3) Order of bytes within a word
-ECL_BIGENDIAN=no
-
-### 1.4) What characters signal an end of line. May be LF (Linefeed or \n)
-###      CR (Carriage return or \r), and CRLF (CR followed by LF).
-ECL_NEWLINE=LF
-
-### 1.5) Can we guess how many characters are available for reading from
-###      the FILE structure?
-###          0 = no
-###          1 = (f)->_IO_read_end - (f)->_IO_read_ptr
-###          2 = (f)->_r
-###          3 = (f)->_cnt
-ECL_FILE_CNT=0
-
-###
-### 1.6) Other integer types (set to 'no' to disable)
-###
-ECL_STDINT_HEADER="#include <stdint.h>"
-ECL_UINT8_T=uint8_t
-ECL_UINT16_T=uint16_t
-ECL_UINT32_T=uint32_t
-ECL_UINT64_T=no
-ECL_INT8_T=int8_t
-ECL_INT16_T=int16_t
-ECL_INT32_T=int32_t
-ECL_INT64_T=no
-ECL_LONG_LONG_BITS=no
-
-###
-### 1.7) Other features (set to 'no' to disable)
-###
-ECL_WORKING_ENVIRON=yes
-
-### 2) To cross-compile ECL so that it runs on the system
-###		arm-unknown-linux-musleabi
-### you need to first compile ECL on the system in which you are building
-### the cross-compiled files, that is
-###		i686-pc-linux-musl
-### By default we assume that ECL can be accessed from some directory in
-### the path.
-ECL_TO_RUN=/usr/bin/ecl
diff --git a/srcpkgs/ecl/files/armv5tel.conf b/srcpkgs/ecl/files/armv5tel.conf
deleted file mode 100644
index 6233550c94d9..000000000000
--- a/srcpkgs/ecl/files/armv5tel.conf
+++ /dev/null
@@ -1,63 +0,0 @@
-###
-### YOU ARE TRYING TO CROSS COMPILE ECL.
-### PLEASE FOLLOW THESE INSTRUCTIONS:
-###
-### 1) Vital information cannot be determined at configuration time
-### because we are not able to run test programs. A file called
-###		
-### has been created, that you will have to fill out. Please do
-### it before invoking "configure" again.
-
-### 1.1) Direction of growth of the stack
-ECL_STACK_DIR=down
-
-### 1.2) Choose an integer datatype which is large enough to host a pointer
-CL_FIXNUM_TYPE=int
-CL_FIXNUM_BITS=32
-CL_FIXNUM_MAX=536870911L
-CL_FIXNUM_MIN=-536870912L
-CL_INT_BITS=32
-CL_LONG_BITS=32
-
-### 1.3) Order of bytes within a word
-ECL_BIGENDIAN=no
-
-### 1.4) What characters signal an end of line. May be LF (Linefeed or \n)
-###      CR (Carriage return or \r), and CRLF (CR followed by LF).
-ECL_NEWLINE=LF
-
-### 1.5) Can we guess how many characters are available for reading from
-###      the FILE structure?
-###          0 = no
-###          1 = (f)->_IO_read_end - (f)->_IO_read_ptr
-###          2 = (f)->_r
-###          3 = (f)->_cnt
-ECL_FILE_CNT=0
-
-###
-### 1.6) Other integer types (set to 'no' to disable)
-###
-ECL_STDINT_HEADER="#include <stdint.h>"
-ECL_UINT8_T=uint8_t
-ECL_UINT16_T=uint16_t
-ECL_UINT32_T=uint32_t
-ECL_UINT64_T=no
-ECL_INT8_T=int8_t
-ECL_INT16_T=int16_t
-ECL_INT32_T=int32_t
-ECL_INT64_T=no
-ECL_LONG_LONG_BITS=no
-
-###
-### 1.7) Other features (set to 'no' to disable)
-###
-ECL_WORKING_ENVIRON=yes
-
-### 2) To cross-compile ECL so that it runs on the system
-###		arm-unknown-linux-gnueabi
-### you need to first compile ECL on the system in which you are building
-### the cross-compiled files, that is
-###		i686-pc-linux-gnu
-### By default we assume that ECL can be accessed from some directory in
-### the path.
-ECL_TO_RUN=/usr/bin/ecl
diff --git a/srcpkgs/ecl/files/armv6l-musl.conf b/srcpkgs/ecl/files/armv6l-musl.conf
deleted file mode 100644
index a48cd8bd4d2f..000000000000
--- a/srcpkgs/ecl/files/armv6l-musl.conf
+++ /dev/null
@@ -1,63 +0,0 @@
-###
-### YOU ARE TRYING TO CROSS COMPILE ECL.
-### PLEASE FOLLOW THESE INSTRUCTIONS:
-###
-### 1) Vital information cannot be determined at configuration time
-### because we are not able to run test programs. A file called
-###		
-### has been created, that you will have to fill out. Please do
-### it before invoking "configure" again.
-
-### 1.1) Direction of growth of the stack
-ECL_STACK_DIR=down
-
-### 1.2) Choose an integer datatype which is large enough to host a pointer
-CL_FIXNUM_TYPE=int
-CL_FIXNUM_BITS=32
-CL_FIXNUM_MAX=536870911L
-CL_FIXNUM_MIN=-536870912L
-CL_INT_BITS=32
-CL_LONG_BITS=32
-
-### 1.3) Order of bytes within a word
-ECL_BIGENDIAN=no
-
-### 1.4) What characters signal an end of line. May be LF (Linefeed or \n)
-###      CR (Carriage return or \r), and CRLF (CR followed by LF).
-ECL_NEWLINE=LF
-
-### 1.5) Can we guess how many characters are available for reading from
-###      the FILE structure?
-###          0 = no
-###          1 = (f)->_IO_read_end - (f)->_IO_read_ptr
-###          2 = (f)->_r
-###          3 = (f)->_cnt
-ECL_FILE_CNT=0
-
-###
-### 1.6) Other integer types (set to 'no' to disable)
-###
-ECL_STDINT_HEADER="#include <stdint.h>"
-ECL_UINT8_T=uint8_t
-ECL_UINT16_T=uint16_t
-ECL_UINT32_T=uint32_t
-ECL_UINT64_T=no
-ECL_INT8_T=int8_t
-ECL_INT16_T=int16_t
-ECL_INT32_T=int32_t
-ECL_INT64_T=no
-ECL_LONG_LONG_BITS=no
-
-###
-### 1.7) Other features (set to 'no' to disable)
-###
-ECL_WORKING_ENVIRON=yes
-
-### 2) To cross-compile ECL so that it runs on the system
-###		armv7l-unknown-linux-musleabihf
-### you need to first compile ECL on the system in which you are building
-### the cross-compiled files, that is
-###		x86_64-unknown-linux-gnu
-### By default we assume that ECL can be accessed from some directory in
-### the path.
-ECL_TO_RUN=/usr/bin/ecl
diff --git a/srcpkgs/ecl/files/armv6l.conf b/srcpkgs/ecl/files/armv6l.conf
deleted file mode 100644
index a48cd8bd4d2f..000000000000
--- a/srcpkgs/ecl/files/armv6l.conf
+++ /dev/null
@@ -1,63 +0,0 @@
-###
-### YOU ARE TRYING TO CROSS COMPILE ECL.
-### PLEASE FOLLOW THESE INSTRUCTIONS:
-###
-### 1) Vital information cannot be determined at configuration time
-### because we are not able to run test programs. A file called
-###		
-### has been created, that you will have to fill out. Please do
-### it before invoking "configure" again.
-
-### 1.1) Direction of growth of the stack
-ECL_STACK_DIR=down
-
-### 1.2) Choose an integer datatype which is large enough to host a pointer
-CL_FIXNUM_TYPE=int
-CL_FIXNUM_BITS=32
-CL_FIXNUM_MAX=536870911L
-CL_FIXNUM_MIN=-536870912L
-CL_INT_BITS=32
-CL_LONG_BITS=32
-
-### 1.3) Order of bytes within a word
-ECL_BIGENDIAN=no
-
-### 1.4) What characters signal an end of line. May be LF (Linefeed or \n)
-###      CR (Carriage return or \r), and CRLF (CR followed by LF).
-ECL_NEWLINE=LF
-
-### 1.5) Can we guess how many characters are available for reading from
-###      the FILE structure?
-###          0 = no
-###          1 = (f)->_IO_read_end - (f)->_IO_read_ptr
-###          2 = (f)->_r
-###          3 = (f)->_cnt
-ECL_FILE_CNT=0
-
-###
-### 1.6) Other integer types (set to 'no' to disable)
-###
-ECL_STDINT_HEADER="#include <stdint.h>"
-ECL_UINT8_T=uint8_t
-ECL_UINT16_T=uint16_t
-ECL_UINT32_T=uint32_t
-ECL_UINT64_T=no
-ECL_INT8_T=int8_t
-ECL_INT16_T=int16_t
-ECL_INT32_T=int32_t
-ECL_INT64_T=no
-ECL_LONG_LONG_BITS=no
-
-###
-### 1.7) Other features (set to 'no' to disable)
-###
-ECL_WORKING_ENVIRON=yes
-
-### 2) To cross-compile ECL so that it runs on the system
-###		armv7l-unknown-linux-musleabihf
-### you need to first compile ECL on the system in which you are building
-### the cross-compiled files, that is
-###		x86_64-unknown-linux-gnu
-### By default we assume that ECL can be accessed from some directory in
-### the path.
-ECL_TO_RUN=/usr/bin/ecl
diff --git a/srcpkgs/ecl/files/armv7l-musl.conf b/srcpkgs/ecl/files/armv7l-musl.conf
deleted file mode 100644
index c70a38d248a3..000000000000
--- a/srcpkgs/ecl/files/armv7l-musl.conf
+++ /dev/null
@@ -1,63 +0,0 @@
-###
-### YOU ARE TRYING TO CROSS COMPILE ECL.
-### PLEASE FOLLOW THESE INSTRUCTIONS:
-###
-### 1) Vital information cannot be determined at configuration time
-### because we are not able to run test programs. A file called
-###		
-### has been created, that you will have to fill out. Please do
-### it before invoking "configure" again.
-
-### 1.1) Direction of growth of the stack
-ECL_STACK_DIR=down
-
-### 1.2) Choose an integer datatype which is large enough to host a pointer
-CL_FIXNUM_TYPE=int
-CL_FIXNUM_BITS=32
-CL_FIXNUM_MAX=536870911L
-CL_FIXNUM_MIN=-536870912L
-CL_INT_BITS=32
-CL_LONG_BITS=32
-
-### 1.3) Order of bytes within a word
-ECL_BIGENDIAN=no
-
-### 1.4) What characters signal an end of line. May be LF (Linefeed or \n)
-###      CR (Carriage return or \r), and CRLF (CR followed by LF).
-ECL_NEWLINE=LF
-
-### 1.5) Can we guess how many characters are available for reading from
-###      the FILE structure?
-###          0 = no
-###          1 = (f)->_IO_read_end - (f)->_IO_read_ptr
-###          2 = (f)->_r
-###          3 = (f)->_cnt
-ECL_FILE_CNT=0
-
-###
-### 1.6) Other integer types (set to 'no' to disable)
-###
-ECL_STDINT_HEADER="#include <stdint.h>"
-ECL_UINT8_T=uint8_t
-ECL_UINT16_T=uint16_t
-ECL_UINT32_T=uint32_t
-ECL_UINT64_T=no
-ECL_INT8_T=int8_t
-ECL_INT16_T=int16_t
-ECL_INT32_T=int32_t
-ECL_INT64_T=no
-ECL_LONG_LONG_BITS=no
-
-###
-### 1.7) Other features (set to 'no' to disable)
-###
-ECL_WORKING_ENVIRON=yes
-
-### 2) To cross-compile ECL so that it runs on the system
-###		armv7l-unknown-linux-gnueabihf
-### you need to first compile ECL on the system in which you are building
-### the cross-compiled files, that is
-###		x86_64-unknown-linux-gnu
-### By default we assume that ECL can be accessed from some directory in
-### the path.
-ECL_TO_RUN=/usr/bin/ecl
diff --git a/srcpkgs/ecl/files/armv7l.conf b/srcpkgs/ecl/files/armv7l.conf
deleted file mode 100644
index c70a38d248a3..000000000000
--- a/srcpkgs/ecl/files/armv7l.conf
+++ /dev/null
@@ -1,63 +0,0 @@
-###
-### YOU ARE TRYING TO CROSS COMPILE ECL.
-### PLEASE FOLLOW THESE INSTRUCTIONS:
-###
-### 1) Vital information cannot be determined at configuration time
-### because we are not able to run test programs. A file called
-###		
-### has been created, that you will have to fill out. Please do
-### it before invoking "configure" again.
-
-### 1.1) Direction of growth of the stack
-ECL_STACK_DIR=down
-
-### 1.2) Choose an integer datatype which is large enough to host a pointer
-CL_FIXNUM_TYPE=int
-CL_FIXNUM_BITS=32
-CL_FIXNUM_MAX=536870911L
-CL_FIXNUM_MIN=-536870912L
-CL_INT_BITS=32
-CL_LONG_BITS=32
-
-### 1.3) Order of bytes within a word
-ECL_BIGENDIAN=no
-
-### 1.4) What characters signal an end of line. May be LF (Linefeed or \n)
-###      CR (Carriage return or \r), and CRLF (CR followed by LF).
-ECL_NEWLINE=LF
-
-### 1.5) Can we guess how many characters are available for reading from
-###      the FILE structure?
-###          0 = no
-###          1 = (f)->_IO_read_end - (f)->_IO_read_ptr
-###          2 = (f)->_r
-###          3 = (f)->_cnt
-ECL_FILE_CNT=0
-
-###
-### 1.6) Other integer types (set to 'no' to disable)
-###
-ECL_STDINT_HEADER="#include <stdint.h>"
-ECL_UINT8_T=uint8_t
-ECL_UINT16_T=uint16_t
-ECL_UINT32_T=uint32_t
-ECL_UINT64_T=no
-ECL_INT8_T=int8_t
-ECL_INT16_T=int16_t
-ECL_INT32_T=int32_t
-ECL_INT64_T=no
-ECL_LONG_LONG_BITS=no
-
-###
-### 1.7) Other features (set to 'no' to disable)
-###
-ECL_WORKING_ENVIRON=yes
-
-### 2) To cross-compile ECL so that it runs on the system
-###		armv7l-unknown-linux-gnueabihf
-### you need to first compile ECL on the system in which you are building
-### the cross-compiled files, that is
-###		x86_64-unknown-linux-gnu
-### By default we assume that ECL can be accessed from some directory in
-### the path.
-ECL_TO_RUN=/usr/bin/ecl
diff --git a/srcpkgs/ecl/files/x86_64-musl.conf b/srcpkgs/ecl/files/cross_config
similarity index 79%
rename from srcpkgs/ecl/files/x86_64-musl.conf
rename to srcpkgs/ecl/files/cross_config
index 0e5351d503c9..78b074c3c7c0 100644
--- a/srcpkgs/ecl/files/x86_64-musl.conf
+++ b/srcpkgs/ecl/files/cross_config
@@ -12,15 +12,28 @@
 ECL_STACK_DIR=down
 
 ### 1.2) Choose an integer datatype which is large enough to host a pointer
-CL_FIXNUM_TYPE="long long int"
-CL_FIXNUM_BITS=64
-CL_FIXNUM_MAX=2305843009213693951LL
-CL_FIXNUM_MIN=-2305843009213693952LL
-CL_INT_BITS=32
-CL_LONG_BITS=64
+if [ "$XBPS_TARGET_WORDSIZE" = "64" ]; then
+	CL_FIXNUM_TYPE="long long int"
+	CL_FIXNUM_BITS=64
+	CL_FIXNUM_MAX=2305843009213693951LL
+	CL_FIXNUM_MIN=-2305843009213693952LL
+	CL_INT_BITS=32
+	CL_LONG_BITS=64
+else
+	CL_FIXNUM_TYPE=int
+	CL_FIXNUM_BITS=32
+	CL_FIXNUM_MAX=536870911L
+	CL_FIXNUM_MIN=-536870912L
+	CL_INT_BITS=32
+	CL_LONG_BITS=32
+fi
 
 ### 1.3) Order of bytes within a word
-ECL_BIGENDIAN=no
+if [ "$XBPS_TARGET_ENDIAN" = "le" ]; then
+	ECL_BIGENDIAN=no
+else
+	ECL_BIGENDIAN=yes
+fi
 
 ### 1.4) What characters signal an end of line. May be LF (Linefeed or \n)
 ###      CR (Carriage return or \r), and CRLF (CR followed by LF).
diff --git a/srcpkgs/ecl/files/mips-musl.conf b/srcpkgs/ecl/files/mips-musl.conf
deleted file mode 100644
index 2198241b6ed7..000000000000
--- a/srcpkgs/ecl/files/mips-musl.conf
+++ /dev/null
@@ -1,63 +0,0 @@
-###
-### YOU ARE TRYING TO CROSS COMPILE ECL.
-### PLEASE FOLLOW THESE INSTRUCTIONS:
-###
-### 1) Vital information cannot be determined at configuration time
-### because we are not able to run test programs. A file called
-###		
-### has been created, that you will have to fill out. Please do
-### it before invoking "configure" again.
-
-### 1.1) Direction of growth of the stack
-ECL_STACK_DIR=down
-
-### 1.2) Choose an integer datatype which is large enough to host a pointer
-CL_FIXNUM_TYPE=int
-CL_FIXNUM_BITS=32
-CL_FIXNUM_MAX=536870911L
-CL_FIXNUM_MIN=-536870912L
-CL_INT_BITS=32
-CL_LONG_BITS=32
-
-### 1.3) Order of bytes within a word
-ECL_BIGENDIAN=yes
-
-### 1.4) What characters signal an end of line. May be LF (Linefeed or \n)
-###      CR (Carriage return or \r), and CRLF (CR followed by LF).
-ECL_NEWLINE=LF
-
-### 1.5) Can we guess how many characters are available for reading from
-###      the FILE structure?
-###          0 = no
-###          1 = (f)->_IO_read_end - (f)->_IO_read_ptr
-###          2 = (f)->_r
-###          3 = (f)->_cnt
-ECL_FILE_CNT=0
-
-###
-### 1.6) Other integer types (set to 'no' to disable)
-###
-ECL_STDINT_HEADER="#include <stdint.h>"
-ECL_UINT8_T=uint8_t
-ECL_UINT16_T=uint16_t
-ECL_UINT32_T=uint32_t
-ECL_UINT64_T=no
-ECL_INT8_T=int8_t
-ECL_INT16_T=int16_t
-ECL_INT32_T=int32_t
-ECL_INT64_T=no
-ECL_LONG_LONG_BITS=no
-
-###
-### 1.7) Other features (set to 'no' to disable)
-###
-ECL_WORKING_ENVIRON=yes
-
-### 2) To cross-compile ECL so that it runs on the system
-###		mips-unknown-linux-musl
-### you need to first compile ECL on the system in which you are building
-### the cross-compiled files, that is
-###		x86_64-unknown-linux-gnu
-### By default we assume that ECL can be accessed from some directory in
-### the path.
-ECL_TO_RUN=/usr/bin/ecl
diff --git a/srcpkgs/ecl/files/mipsel-musl.conf b/srcpkgs/ecl/files/mipsel-musl.conf
deleted file mode 100644
index 0b553b267032..000000000000
--- a/srcpkgs/ecl/files/mipsel-musl.conf
+++ /dev/null
@@ -1,63 +0,0 @@
-###
-### YOU ARE TRYING TO CROSS COMPILE ECL.
-### PLEASE FOLLOW THESE INSTRUCTIONS:
-###
-### 1) Vital information cannot be determined at configuration time
-### because we are not able to run test programs. A file called
-###		
-### has been created, that you will have to fill out. Please do
-### it before invoking "configure" again.
-
-### 1.1) Direction of growth of the stack
-ECL_STACK_DIR=down
-
-### 1.2) Choose an integer datatype which is large enough to host a pointer
-CL_FIXNUM_TYPE=int
-CL_FIXNUM_BITS=32
-CL_FIXNUM_MAX=536870911L
-CL_FIXNUM_MIN=-536870912L
-CL_INT_BITS=32
-CL_LONG_BITS=32
-
-### 1.3) Order of bytes within a word
-ECL_BIGENDIAN=no
-
-### 1.4) What characters signal an end of line. May be LF (Linefeed or \n)
-###      CR (Carriage return or \r), and CRLF (CR followed by LF).
-ECL_NEWLINE=LF
-
-### 1.5) Can we guess how many characters are available for reading from
-###      the FILE structure?
-###          0 = no
-###          1 = (f)->_IO_read_end - (f)->_IO_read_ptr
-###          2 = (f)->_r
-###          3 = (f)->_cnt
-ECL_FILE_CNT=0
-
-###
-### 1.6) Other integer types (set to 'no' to disable)
-###
-ECL_STDINT_HEADER="#include <stdint.h>"
-ECL_UINT8_T=uint8_t
-ECL_UINT16_T=uint16_t
-ECL_UINT32_T=uint32_t
-ECL_UINT64_T=no
-ECL_INT8_T=int8_t
-ECL_INT16_T=int16_t
-ECL_INT32_T=int32_t
-ECL_INT64_T=no
-ECL_LONG_LONG_BITS=no
-
-###
-### 1.7) Other features (set to 'no' to disable)
-###
-ECL_WORKING_ENVIRON=yes
-
-### 2) To cross-compile ECL so that it runs on the system
-###		mips-unknown-linux-musl
-### you need to first compile ECL on the system in which you are building
-### the cross-compiled files, that is
-###		x86_64-unknown-linux-gnu
-### By default we assume that ECL can be accessed from some directory in
-### the path.
-ECL_TO_RUN=/usr/bin/ecl
diff --git a/srcpkgs/ecl/files/mipselhf-musl.conf b/srcpkgs/ecl/files/mipselhf-musl.conf
deleted file mode 100644
index 0b553b267032..000000000000
--- a/srcpkgs/ecl/files/mipselhf-musl.conf
+++ /dev/null
@@ -1,63 +0,0 @@
-###
-### YOU ARE TRYING TO CROSS COMPILE ECL.
-### PLEASE FOLLOW THESE INSTRUCTIONS:
-###
-### 1) Vital information cannot be determined at configuration time
-### because we are not able to run test programs. A file called
-###		
-### has been created, that you will have to fill out. Please do
-### it before invoking "configure" again.
-
-### 1.1) Direction of growth of the stack
-ECL_STACK_DIR=down
-
-### 1.2) Choose an integer datatype which is large enough to host a pointer
-CL_FIXNUM_TYPE=int
-CL_FIXNUM_BITS=32
-CL_FIXNUM_MAX=536870911L
-CL_FIXNUM_MIN=-536870912L
-CL_INT_BITS=32
-CL_LONG_BITS=32
-
-### 1.3) Order of bytes within a word
-ECL_BIGENDIAN=no
-
-### 1.4) What characters signal an end of line. May be LF (Linefeed or \n)
-###      CR (Carriage return or \r), and CRLF (CR followed by LF).
-ECL_NEWLINE=LF
-
-### 1.5) Can we guess how many characters are available for reading from
-###      the FILE structure?
-###          0 = no
-###          1 = (f)->_IO_read_end - (f)->_IO_read_ptr
-###          2 = (f)->_r
-###          3 = (f)->_cnt
-ECL_FILE_CNT=0
-
-###
-### 1.6) Other integer types (set to 'no' to disable)
-###
-ECL_STDINT_HEADER="#include <stdint.h>"
-ECL_UINT8_T=uint8_t
-ECL_UINT16_T=uint16_t
-ECL_UINT32_T=uint32_t
-ECL_UINT64_T=no
-ECL_INT8_T=int8_t
-ECL_INT16_T=int16_t
-ECL_INT32_T=int32_t
-ECL_INT64_T=no
-ECL_LONG_LONG_BITS=no
-
-###
-### 1.7) Other features (set to 'no' to disable)
-###
-ECL_WORKING_ENVIRON=yes
-
-### 2) To cross-compile ECL so that it runs on the system
-###		mips-unknown-linux-musl
-### you need to first compile ECL on the system in which you are building
-### the cross-compiled files, that is
-###		x86_64-unknown-linux-gnu
-### By default we assume that ECL can be accessed from some directory in
-### the path.
-ECL_TO_RUN=/usr/bin/ecl
diff --git a/srcpkgs/ecl/files/mipshf-musl.conf b/srcpkgs/ecl/files/mipshf-musl.conf
deleted file mode 100644
index 2198241b6ed7..000000000000
--- a/srcpkgs/ecl/files/mipshf-musl.conf
+++ /dev/null
@@ -1,63 +0,0 @@
-###
-### YOU ARE TRYING TO CROSS COMPILE ECL.
-### PLEASE FOLLOW THESE INSTRUCTIONS:
-###
-### 1) Vital information cannot be determined at configuration time
-### because we are not able to run test programs. A file called
-###		
-### has been created, that you will have to fill out. Please do
-### it before invoking "configure" again.
-
-### 1.1) Direction of growth of the stack
-ECL_STACK_DIR=down
-
-### 1.2) Choose an integer datatype which is large enough to host a pointer
-CL_FIXNUM_TYPE=int
-CL_FIXNUM_BITS=32
-CL_FIXNUM_MAX=536870911L
-CL_FIXNUM_MIN=-536870912L
-CL_INT_BITS=32
-CL_LONG_BITS=32
-
-### 1.3) Order of bytes within a word
-ECL_BIGENDIAN=yes
-
-### 1.4) What characters signal an end of line. May be LF (Linefeed or \n)
-###      CR (Carriage return or \r), and CRLF (CR followed by LF).
-ECL_NEWLINE=LF
-
-### 1.5) Can we guess how many characters are available for reading from
-###      the FILE structure?
-###          0 = no
-###          1 = (f)->_IO_read_end - (f)->_IO_read_ptr
-###          2 = (f)->_r
-###          3 = (f)->_cnt
-ECL_FILE_CNT=0
-
-###
-### 1.6) Other integer types (set to 'no' to disable)
-###
-ECL_STDINT_HEADER="#include <stdint.h>"
-ECL_UINT8_T=uint8_t
-ECL_UINT16_T=uint16_t
-ECL_UINT32_T=uint32_t
-ECL_UINT64_T=no
-ECL_INT8_T=int8_t
-ECL_INT16_T=int16_t
-ECL_INT32_T=int32_t
-ECL_INT64_T=no
-ECL_LONG_LONG_BITS=no
-
-###
-### 1.7) Other features (set to 'no' to disable)
-###
-ECL_WORKING_ENVIRON=yes
-
-### 2) To cross-compile ECL so that it runs on the system
-###		mips-unknown-linux-musl
-### you need to first compile ECL on the system in which you are building
-### the cross-compiled files, that is
-###		x86_64-unknown-linux-gnu
-### By default we assume that ECL can be accessed from some directory in
-### the path.
-ECL_TO_RUN=/usr/bin/ecl
diff --git a/srcpkgs/ecl/files/ppc-musl.conf b/srcpkgs/ecl/files/ppc-musl.conf
deleted file mode 100644
index cdca29e1d613..000000000000
--- a/srcpkgs/ecl/files/ppc-musl.conf
+++ /dev/null
@@ -1,63 +0,0 @@
-###
-### YOU ARE TRYING TO CROSS COMPILE ECL.
-### PLEASE FOLLOW THESE INSTRUCTIONS:
-###
-### 1) Vital information cannot be determined at configuration time
-### because we are not able to run test programs. A file called
-###		
-### has been created, that you will have to fill out. Please do
-### it before invoking "configure" again.
-
-### 1.1) Direction of growth of the stack
-ECL_STACK_DIR=down
-
-### 1.2) Choose an integer datatype which is large enough to host a pointer
-CL_FIXNUM_TYPE=int
-CL_FIXNUM_BITS=32
-CL_FIXNUM_MAX=536870911L
-CL_FIXNUM_MIN=-536870912L
-CL_INT_BITS=32
-CL_LONG_BITS=32
-
-### 1.3) Order of bytes within a word
-ECL_BIGENDIAN=yes
-
-### 1.4) What characters signal an end of line. May be LF (Linefeed or \n)
-###      CR (Carriage return or \r), and CRLF (CR followed by LF).
-ECL_NEWLINE=LF
-
-### 1.5) Can we guess how many characters are available for reading from
-###      the FILE structure?
-###          0 = no
-###          1 = (f)->_IO_read_end - (f)->_IO_read_ptr
-###          2 = (f)->_r
-###          3 = (f)->_cnt
-ECL_FILE_CNT=0
-
-###
-### 1.6) Other integer types (set to 'no' to disable)
-###
-ECL_STDINT_HEADER="#include <stdint.h>"
-ECL_UINT8_T=uint8_t
-ECL_UINT16_T=uint16_t
-ECL_UINT32_T=uint32_t
-ECL_UINT64_T=no
-ECL_INT8_T=int8_t
-ECL_INT16_T=int16_t
-ECL_INT32_T=int32_t
-ECL_INT64_T=no
-ECL_LONG_LONG_BITS=no
-
-###
-### 1.7) Other features (set to 'no' to disable)
-###
-ECL_WORKING_ENVIRON=yes
-
-### 2) To cross-compile ECL so that it runs on the system
-###		powerpc-unknown-linux-musl
-### you need to first compile ECL on the system in which you are building
-### the cross-compiled files, that is
-###		i686-pc-linux-musl
-### By default we assume that ECL can be accessed from some directory in
-### the path.
-ECL_TO_RUN=/usr/bin/ecl
diff --git a/srcpkgs/ecl/files/ppc.conf b/srcpkgs/ecl/files/ppc.conf
deleted file mode 100644
index 8c5c3d1bb4d3..000000000000
--- a/srcpkgs/ecl/files/ppc.conf
+++ /dev/null
@@ -1,63 +0,0 @@
-###
-### YOU ARE TRYING TO CROSS COMPILE ECL.
-### PLEASE FOLLOW THESE INSTRUCTIONS:
-###
-### 1) Vital information cannot be determined at configuration time
-### because we are not able to run test programs. A file called
-###		
-### has been created, that you will have to fill out. Please do
-### it before invoking "configure" again.
-
-### 1.1) Direction of growth of the stack
-ECL_STACK_DIR=down
-
-### 1.2) Choose an integer datatype which is large enough to host a pointer
-CL_FIXNUM_TYPE=int
-CL_FIXNUM_BITS=32
-CL_FIXNUM_MAX=536870911L
-CL_FIXNUM_MIN=-536870912L
-CL_INT_BITS=32
-CL_LONG_BITS=32
-
-### 1.3) Order of bytes within a word
-ECL_BIGENDIAN=yes
-
-### 1.4) What characters signal an end of line. May be LF (Linefeed or \n)
-###      CR (Carriage return or \r), and CRLF (CR followed by LF).
-ECL_NEWLINE=LF
-
-### 1.5) Can we guess how many characters are available for reading from
-###      the FILE structure?
-###          0 = no
-###          1 = (f)->_IO_read_end - (f)->_IO_read_ptr
-###          2 = (f)->_r
-###          3 = (f)->_cnt
-ECL_FILE_CNT=0
-
-###
-### 1.6) Other integer types (set to 'no' to disable)
-###
-ECL_STDINT_HEADER="#include <stdint.h>"
-ECL_UINT8_T=uint8_t
-ECL_UINT16_T=uint16_t
-ECL_UINT32_T=uint32_t
-ECL_UINT64_T=no
-ECL_INT8_T=int8_t
-ECL_INT16_T=int16_t
-ECL_INT32_T=int32_t
-ECL_INT64_T=no
-ECL_LONG_LONG_BITS=no
-
-###
-### 1.7) Other features (set to 'no' to disable)
-###
-ECL_WORKING_ENVIRON=yes
-
-### 2) To cross-compile ECL so that it runs on the system
-###		powerpc-unknown-linux-gnu
-### you need to first compile ECL on the system in which you are building
-### the cross-compiled files, that is
-###		i686-pc-linux-gnu
-### By default we assume that ECL can be accessed from some directory in
-### the path.
-ECL_TO_RUN=/usr/bin/ecl
diff --git a/srcpkgs/ecl/files/ppc64-musl.conf b/srcpkgs/ecl/files/ppc64-musl.conf
deleted file mode 100644
index d9aac8d11812..000000000000
--- a/srcpkgs/ecl/files/ppc64-musl.conf
+++ /dev/null
@@ -1,63 +0,0 @@
-###
-### YOU ARE TRYING TO CROSS COMPILE ECL.
-### PLEASE FOLLOW THESE INSTRUCTIONS:
-###
-### 1) Vital information cannot be determined at configuration time
-### because we are not able to run test programs. A file called
-###		
-### has been created, that you will have to fill out. Please do
-### it before invoking "configure" again.
-
-### 1.1) Direction of growth of the stack
-ECL_STACK_DIR=down
-
-### 1.2) Choose an integer datatype which is large enough to host a pointer
-CL_FIXNUM_TYPE="long long int"
-CL_FIXNUM_BITS=64
-CL_FIXNUM_MAX=2305843009213693951LL
-CL_FIXNUM_MIN=-2305843009213693952LL
-CL_INT_BITS=32
-CL_LONG_BITS=64
-
-### 1.3) Order of bytes within a word
-ECL_BIGENDIAN=yes
-
-### 1.4) What characters signal an end of line. May be LF (Linefeed or \n)
-###      CR (Carriage return or \r), and CRLF (CR followed by LF).
-ECL_NEWLINE=LF
-
-### 1.5) Can we guess how many characters are available for reading from
-###      the FILE structure?
-###          0 = no
-###          1 = (f)->_IO_read_end - (f)->_IO_read_ptr
-###          2 = (f)->_r
-###          3 = (f)->_cnt
-ECL_FILE_CNT=0
-
-###
-### 1.6) Other integer types (set to 'no' to disable)
-###
-ECL_STDINT_HEADER="#include <stdint.h>"
-ECL_UINT8_T=uint8_t
-ECL_UINT16_T=uint16_t
-ECL_UINT32_T=uint32_t
-ECL_UINT64_T=uint64_t
-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
-
-###
-### 1.7) Other features (set to 'no' to disable)
-###
-ECL_WORKING_ENVIRON=yes
-
-### 2) To cross-compile ECL so that it runs on the system
-###		powerpc64-unknown-linux-musl
-### you need to first compile ECL on the system in which you are building
-### the cross-compiled files, that is
-###		x86_64-unknown-linux-musl
-### By default we assume that ECL can be accessed from some directory in
-### the path.
-ECL_TO_RUN=/usr/bin/ecl
diff --git a/srcpkgs/ecl/files/ppc64.conf b/srcpkgs/ecl/files/ppc64.conf
deleted file mode 100644
index a47bab0ad9be..000000000000
--- a/srcpkgs/ecl/files/ppc64.conf
+++ /dev/null
@@ -1,63 +0,0 @@
-###
-### YOU ARE TRYING TO CROSS COMPILE ECL.
-### PLEASE FOLLOW THESE INSTRUCTIONS:
-###
-### 1) Vital information cannot be determined at configuration time
-### because we are not able to run test programs. A file called
-###		
-### has been created, that you will have to fill out. Please do
-### it before invoking "configure" again.
-
-### 1.1) Direction of growth of the stack
-ECL_STACK_DIR=down
-
-### 1.2) Choose an integer datatype which is large enough to host a pointer
-CL_FIXNUM_TYPE="long long int"
-CL_FIXNUM_BITS=64
-CL_FIXNUM_MAX=2305843009213693951LL
-CL_FIXNUM_MIN=-2305843009213693952LL
-CL_INT_BITS=32
-CL_LONG_BITS=64
-
-### 1.3) Order of bytes within a word
-ECL_BIGENDIAN=yes
-
-### 1.4) What characters signal an end of line. May be LF (Linefeed or \n)
-###      CR (Carriage return or \r), and CRLF (CR followed by LF).
-ECL_NEWLINE=LF
-
-### 1.5) Can we guess how many characters are available for reading from
-###      the FILE structure?
-###          0 = no
-###          1 = (f)->_IO_read_end - (f)->_IO_read_ptr
-###          2 = (f)->_r
-###          3 = (f)->_cnt
-ECL_FILE_CNT=0
-
-###
-### 1.6) Other integer types (set to 'no' to disable)
-###
-ECL_STDINT_HEADER="#include <stdint.h>"
-ECL_UINT8_T=uint8_t
-ECL_UINT16_T=uint16_t
-ECL_UINT32_T=uint32_t
-ECL_UINT64_T=uint64_t
-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
-
-###
-### 1.7) Other features (set to 'no' to disable)
-###
-ECL_WORKING_ENVIRON=yes
-
-### 2) To cross-compile ECL so that it runs on the system
-###		powerpc64-unknown-linux-gnu
-### you need to first compile ECL on the system in which you are building
-### the cross-compiled files, that is
-###		x86_64-unknown-linux-gnu
-### By default we assume that ECL can be accessed from some directory in
-### the path.
-ECL_TO_RUN=/usr/bin/ecl
diff --git a/srcpkgs/ecl/files/ppc64le-musl.conf b/srcpkgs/ecl/files/ppc64le-musl.conf
deleted file mode 100644
index 3a02a9ae3ffb..000000000000
--- a/srcpkgs/ecl/files/ppc64le-musl.conf
+++ /dev/null
@@ -1,63 +0,0 @@
-###
-### YOU ARE TRYING TO CROSS COMPILE ECL.
-### PLEASE FOLLOW THESE INSTRUCTIONS:
-###
-### 1) Vital information cannot be determined at configuration time
-### because we are not able to run test programs. A file called
-###		
-### has been created, that you will have to fill out. Please do
-### it before invoking "configure" again.
-
-### 1.1) Direction of growth of the stack
-ECL_STACK_DIR=down
-
-### 1.2) Choose an integer datatype which is large enough to host a pointer
-CL_FIXNUM_TYPE="long long int"
-CL_FIXNUM_BITS=64
-CL_FIXNUM_MAX=2305843009213693951LL
-CL_FIXNUM_MIN=-2305843009213693952LL
-CL_INT_BITS=32
-CL_LONG_BITS=64
-
-### 1.3) Order of bytes within a word
-ECL_BIGENDIAN=no
-
-### 1.4) What characters signal an end of line. May be LF (Linefeed or \n)
-###      CR (Carriage return or \r), and CRLF (CR followed by LF).
-ECL_NEWLINE=LF
-
-### 1.5) Can we guess how many characters are available for reading from
-###      the FILE structure?
-###          0 = no
-###          1 = (f)->_IO_read_end - (f)->_IO_read_ptr
-###          2 = (f)->_r
-###          3 = (f)->_cnt
-ECL_FILE_CNT=0
-
-###
-### 1.6) Other integer types (set to 'no' to disable)
-###
-ECL_STDINT_HEADER="#include <stdint.h>"
-ECL_UINT8_T=uint8_t
-ECL_UINT16_T=uint16_t
-ECL_UINT32_T=uint32_t
-ECL_UINT64_T=uint64_t
-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
-
-###
-### 1.7) Other features (set to 'no' to disable)
-###
-ECL_WORKING_ENVIRON=yes
-
-### 2) To cross-compile ECL so that it runs on the system
-###		powerpc64le-unknown-linux-musl
-### you need to first compile ECL on the system in which you are building
-### the cross-compiled files, that is
-###		x86_64-unknown-linux-musl
-### By default we assume that ECL can be accessed from some directory in
-### the path.
-ECL_TO_RUN=/usr/bin/ecl
diff --git a/srcpkgs/ecl/files/ppc64le.conf b/srcpkgs/ecl/files/ppc64le.conf
deleted file mode 100644
index 59b1ad44e998..000000000000
--- a/srcpkgs/ecl/files/ppc64le.conf
+++ /dev/null
@@ -1,63 +0,0 @@
-###
-### YOU ARE TRYING TO CROSS COMPILE ECL.
-### PLEASE FOLLOW THESE INSTRUCTIONS:
-###
-### 1) Vital information cannot be determined at configuration time
-### because we are not able to run test programs. A file called
-###		
-### has been created, that you will have to fill out. Please do
-### it before invoking "configure" again.
-
-### 1.1) Direction of growth of the stack
-ECL_STACK_DIR=down
-
-### 1.2) Choose an integer datatype which is large enough to host a pointer
-CL_FIXNUM_TYPE="long long int"
-CL_FIXNUM_BITS=64
-CL_FIXNUM_MAX=2305843009213693951LL
-CL_FIXNUM_MIN=-2305843009213693952LL
-CL_INT_BITS=32
-CL_LONG_BITS=64
-
-### 1.3) Order of bytes within a word
-ECL_BIGENDIAN=no
-
-### 1.4) What characters signal an end of line. May be LF (Linefeed or \n)
-###      CR (Carriage return or \r), and CRLF (CR followed by LF).
-ECL_NEWLINE=LF
-
-### 1.5) Can we guess how many characters are available for reading from
-###      the FILE structure?
-###          0 = no
-###          1 = (f)->_IO_read_end - (f)->_IO_read_ptr
-###          2 = (f)->_r
-###          3 = (f)->_cnt
-ECL_FILE_CNT=0
-
-###
-### 1.6) Other integer types (set to 'no' to disable)
-###
-ECL_STDINT_HEADER="#include <stdint.h>"
-ECL_UINT8_T=uint8_t
-ECL_UINT16_T=uint16_t
-ECL_UINT32_T=uint32_t
-ECL_UINT64_T=uint64_t
-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
-
-###
-### 1.7) Other features (set to 'no' to disable)
-###
-ECL_WORKING_ENVIRON=yes
-
-### 2) To cross-compile ECL so that it runs on the system
-###		powerpc64le-unknown-linux-gnu
-### you need to first compile ECL on the system in which you are building
-### the cross-compiled files, that is
-###		x86_64-unknown-linux-gnu
-### By default we assume that ECL can be accessed from some directory in
-### the path.
-ECL_TO_RUN=/usr/bin/ecl
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
index c48b835c8d32..9d10af8d573e 100644
--- a/srcpkgs/ecl/patches/fix-math_fenv_h.patch
+++ b/srcpkgs/ecl/patches/fix-math_fenv_h.patch
@@ -1,99 +1,31 @@
 Source: @pullmoll
-Upstream: no
+Upstream: https://gitlab.com/embeddable-common-lisp/ecl/-/issues/653#note_675299471
 Reason: Some architectures do not define all of the FE_.. constants
+Example: mips-musl needs this
 
---- 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/src/h/impl/math_fenv.h b/src/h/impl/math_fenv.h
+index ea13d87b4..2afbb9549 100644
+--- a/src/h/impl/math_fenv.h
++++ b/src/h/impl/math_fenv.h
+@@ -55,6 +55,21 @@
+ #ifdef HAVE_FENV_H
+ # define ECL_WITHOUT_FPE_BEGIN do { fenv_t env; feholdexcept(&env);
+ # define ECL_WITHOUT_FPE_END        fesetenv(&env); } while (0)
++# 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
+ #else
+ # define FE_INVALID 1
+ # define FE_DIVBYZERO 2
diff --git a/srcpkgs/ecl/template b/srcpkgs/ecl/template
index a4e160c15bed..2f13da4003f4 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,10 +13,10 @@ maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 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
 	hostmakedepends+=" ecl"
-	configure_args+=" --with-cross-config=${XBPS_SRCPKGDIR}/ecl/files/${XBPS_TARGET_MACHINE}.conf"
+	configure_args+=" --with-cross-config=${XBPS_SRCPKGDIR}/ecl/files/cross_config"
 fi

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: ecl: update to 21.2.1.
  2021-08-24 23:33 [PR PATCH] ecl: update to 21.2.1 tornaria
                   ` (17 preceding siblings ...)
  2021-09-15  2:18 ` [PR PATCH] [Updated] " tornaria
@ 2021-09-16  0:29 ` knusbaum
  2021-09-16  1:24 ` ericonr
  2021-09-16  1:43 ` [PR PATCH] [Merged]: " ericonr
  20 siblings, 0 replies; 22+ messages in thread
From: knusbaum @ 2021-09-16  0:29 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 158 bytes --]

New comment by knusbaum on void-packages repository

https://github.com/void-linux/void-packages/pull/32659#issuecomment-920483363

Comment:
LGTM, nice work.

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: ecl: update to 21.2.1.
  2021-08-24 23:33 [PR PATCH] ecl: update to 21.2.1 tornaria
                   ` (18 preceding siblings ...)
  2021-09-16  0:29 ` knusbaum
@ 2021-09-16  1:24 ` ericonr
  2021-09-16  1:43 ` [PR PATCH] [Merged]: " ericonr
  20 siblings, 0 replies; 22+ messages in thread
From: ericonr @ 2021-09-16  1:24 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 172 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/32659#issuecomment-920503239

Comment:
This is an awesome PR, thanks!!

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [PR PATCH] [Merged]: ecl: update to 21.2.1.
  2021-08-24 23:33 [PR PATCH] ecl: update to 21.2.1 tornaria
                   ` (19 preceding siblings ...)
  2021-09-16  1:24 ` ericonr
@ 2021-09-16  1:43 ` ericonr
  20 siblings, 0 replies; 22+ messages in thread
From: ericonr @ 2021-09-16  1:43 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 254 bytes --]

There's a merged pull request on the void-packages repository

ecl: update to 21.2.1.
https://github.com/void-linux/void-packages/pull/32659

Description:
I compiled and doctested sage-9.4 with this PR + other updates and new packages. All working fine.

^ permalink raw reply	[flat|nested] 22+ messages in thread

end of thread, other threads:[~2021-09-16  1:43 UTC | newest]

Thread overview: 22+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-08-24 23:33 [PR PATCH] ecl: update to 21.2.1 tornaria
2021-08-25  7:36 ` dkwo
2021-08-25 13:00 ` tornaria
2021-08-25 13:02 ` [PR PATCH] [Updated] " tornaria
2021-08-25 17:15 ` ericonr
2021-08-25 17:38 ` tornaria
2021-08-25 19:20 ` tornaria
2021-08-27 17:39 ` ericonr
2021-08-27 20:21 ` [PR PATCH] [Updated] " tornaria
2021-08-27 20:22 ` tornaria
2021-09-13  7:39 ` dkwo
2021-09-14 20:44 ` tornaria
2021-09-14 22:49 ` tornaria
2021-09-14 22:49 ` [PR PATCH] [Updated] " tornaria
2021-09-14 22:54 ` tornaria
2021-09-14 23:09 ` [PR PATCH] [Updated] " tornaria
2021-09-14 23:12 ` tornaria
2021-09-14 23:13 ` tornaria
2021-09-15  2:18 ` [PR PATCH] [Updated] " tornaria
2021-09-16  0:29 ` knusbaum
2021-09-16  1:24 ` ericonr
2021-09-16  1:43 ` [PR PATCH] [Merged]: " ericonr

Github messages for voidlinux

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://inbox.vuxu.org/voidlinux-github

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V1 voidlinux-github voidlinux-github/ https://inbox.vuxu.org/voidlinux-github \
		voidlinux-github@inbox.vuxu.org
	public-inbox-index voidlinux-github

Example config snippet for mirrors.
Newsgroup available over NNTP:
	nntp://inbox.vuxu.org/vuxu.github.voidlinux


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git