From 8bacc94036898b06e0c37e843465f3dcf8bfff51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Tue, 24 Aug 2021 18:55:59 -0300 Subject: [PATCH] ecl: update to 21.2.1. 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 " 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 " 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 " -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 " -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 " -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 " -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 " -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 " -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 " -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 " -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 " -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 " -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 " -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 " -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 " -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 " -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 " -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 " 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