diff --git a/srcpkgs/ccl/patches/glibc-2.26-ucontext.patch b/srcpkgs/ccl/patches/glibc-2.26-ucontext.patch deleted file mode 100644 index 43ac3499fce..00000000000 --- a/srcpkgs/ccl/patches/glibc-2.26-ucontext.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- lisp-kernel/platform-linuxx8632.h.orig 2015-11-06 20:10:11.000000000 +0000 -+++ lisp-kernel/platform-linuxx8632.h 2017-11-14 15:25:38.758675003 +0000 -@@ -20,7 +20,8 @@ - #define PLATFORM_CPU PLATFORM_CPU_X86 - #define PLATFORM_WORD_SIZE PLATFORM_WORD_SIZE_32 - --typedef struct ucontext ExceptionInformation; -+#include -+typedef ucontext_t ExceptionInformation; - - #define MAXIMUM_MAPPABLE_MEMORY (9U<<28) - #define IMAGE_BASE_ADDRESS 0x10000000 ---- lisp-kernel/platform-linuxx8664.h.orig 2015-11-06 20:10:11.000000000 +0000 -+++ lisp-kernel/platform-linuxx8664.h 2017-11-14 15:25:24.551674270 +0000 -@@ -20,7 +21,8 @@ - #define PLATFORM_CPU PLATFORM_CPU_X86 - #define PLATFORM_WORD_SIZE PLATFORM_WORD_SIZE_64 - --typedef struct ucontext ExceptionInformation; -+#include -+typedef ucontext_t ExceptionInformation; - - #define MAXIMUM_MAPPABLE_MEMORY (512L<<30L) - #define IMAGE_BASE_ADDRESS 0x300000000000L ---- lisp-kernel/x86-exceptions.c.orig 2017-11-14 15:28:32.000000000 +0000 -+++ lisp-kernel/x86-exceptions.c 2017-11-14 15:28:53.053685026 +0000 -@@ -1679,7 +1679,7 @@ - siginfo_t *pinfo; - void *puc; - siginfo_t info; -- struct ucontext uc; -+ ucontext_t uc; - struct _fpstate fpstate; - char retcode[8]; - }; -@@ -2427,7 +2427,7 @@ - It's easier to just reserve that page here than it would be to - change copy_ucontext(). - */ -- stack.ss_size -= sizeof(struct ucontext); -+ stack.ss_size -= sizeof(ucontext_t); - #endif - if (sigaltstack(&stack, NULL) != 0) { - perror("sigaltstack"); diff --git a/srcpkgs/ccl/patches/musl-fixes.patch b/srcpkgs/ccl/patches/musl-fixes.patch index 8a6c3d7251c..4fee1f4420e 100644 --- a/srcpkgs/ccl/patches/musl-fixes.patch +++ b/srcpkgs/ccl/patches/musl-fixes.patch @@ -23,7 +23,7 @@ #include #endif #include -@@ -1702,7 +1702,11 @@ +@@ -1702,6 +1702,10 @@ ensure_gs_available(char *progname) { LispObj fs_addr = 0L, gs_addr = 0L, cur_thread = (LispObj)pthread_self(); @@ -32,9 +32,8 @@ + #else + #define gnu_get_libc_version() "" + #endif - - arch_prctl(ARCH_GET_GS, &gs_addr); - arch_prctl(ARCH_GET_FS, &fs_addr); + /* + * According arch_prctl(2), there's no function prototype for --- lisp-kernel/thread_manager.c 2015-11-07 07:10:11.000000000 +1100 +++ lisp-kernel/thread_manager.c 2016-12-18 10:32:35.095701899 +1100 @@ -185,7 +185,7 @@ diff --git a/srcpkgs/ccl/template b/srcpkgs/ccl/template index 7feeda1a532..3796c7ef4c5 100644 --- a/srcpkgs/ccl/template +++ b/srcpkgs/ccl/template @@ -1,6 +1,6 @@ pkgname=ccl -version=1.11 -revision=2 +version=1.11.5 +revision=1 wrksrc="ccl" only_for_archs="i686 i686-musl x86_64 x86_64-musl" build_style=gnu-makefile @@ -9,8 +9,8 @@ short_desc="Clozure Common Lisp interpreter and compiler" maintainer="Ankur Kothari " license="Apache-2.0" homepage="http://ccl.clozure.com/" -distfiles="ftp://ftp.clozure.com/pub/release/${version}/${pkgname}-${version}-linuxx86.tar.gz" -checksum="08e885e8c2bb6e4abd42b8e8e2b60f257c6929eb34b8ec87ca1ecf848fac6d70" +distfiles="https://github.com/Clozure/ccl/releases/download/v${version}/${pkgname}-${version}-linuxx86.tar.gz" +checksum=b80850d8d6ca8662499975f1cd76bf51affdd29e2025796ddcff6576fe704143 nopie=1 nostrip=1 disable_parallel_build=1 @@ -59,7 +59,6 @@ EOF vcopy scripts usr/lib/$pkgname vcopy tools usr/lib/$pkgname vcopy xdump usr/lib/$pkgname - vcopy contrib usr/lib/$pkgname vmkdir usr/share/examples/$pkgname vcopy "examples/*" usr/share/examples/$pkgname