Github messages for voidlinux
 help / color / mirror / Atom feed
From: tornaria <tornaria@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] ecl: update to 21.2.1.
Date: Wed, 25 Aug 2021 15:02:59 +0200	[thread overview]
Message-ID: <20210825130259.4eDh0MMi9vcLDy7z_9RjcYQ71SywOnWMk5qZ-uFP2Lg@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-32659@inbox.vuxu.org>

[-- 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

  parent reply	other threads:[~2021-08-25 13:03 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-08-24 23:33 [PR PATCH] " tornaria
2021-08-25  7:36 ` dkwo
2021-08-25 13:00 ` tornaria
2021-08-25 13:02 ` tornaria [this message]
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

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210825130259.4eDh0MMi9vcLDy7z_9RjcYQ71SywOnWMk5qZ-uFP2Lg@z \
    --to=tornaria@users.noreply.github.com \
    --cc=ml@inbox.vuxu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).