From 623904770382eac1bb7ee45eacc9bef3f77dd532 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Wed, 15 Nov 2017 08:09:58 +0000 Subject: [PATCH] ccl: musl broken --- srcpkgs/ccl/patches/glibc-2.26-ucontext.patch | 14 ++++++++------ srcpkgs/ccl/template | 6 +++++- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/srcpkgs/ccl/patches/glibc-2.26-ucontext.patch b/srcpkgs/ccl/patches/glibc-2.26-ucontext.patch index c9a3108b11..43ac3499fc 100644 --- a/srcpkgs/ccl/patches/glibc-2.26-ucontext.patch +++ b/srcpkgs/ccl/patches/glibc-2.26-ucontext.patch @@ -1,22 +1,24 @@ --- 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,7 @@ +@@ -20,7 +20,8 @@ #define PLATFORM_CPU PLATFORM_CPU_X86 #define PLATFORM_WORD_SIZE PLATFORM_WORD_SIZE_32 -typedef struct ucontext ExceptionInformation; -+typedef struct ucontext_t 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 +20,7 @@ +@@ -20,7 +21,8 @@ #define PLATFORM_CPU PLATFORM_CPU_X86 #define PLATFORM_WORD_SIZE PLATFORM_WORD_SIZE_64 -typedef struct ucontext ExceptionInformation; -+typedef struct ucontext_t ExceptionInformation; ++#include ++typedef ucontext_t ExceptionInformation; #define MAXIMUM_MAPPABLE_MEMORY (512L<<30L) #define IMAGE_BASE_ADDRESS 0x300000000000L @@ -27,7 +29,7 @@ void *puc; siginfo_t info; - struct ucontext uc; -+ struct ucontext_t uc; ++ ucontext_t uc; struct _fpstate fpstate; char retcode[8]; }; @@ -36,7 +38,7 @@ change copy_ucontext(). */ - stack.ss_size -= sizeof(struct ucontext); -+ stack.ss_size -= sizeof(struct ucontext_t); ++ stack.ss_size -= sizeof(ucontext_t); #endif if (sigaltstack(&stack, NULL) != 0) { perror("sigaltstack"); diff --git a/srcpkgs/ccl/template b/srcpkgs/ccl/template index 76423b863d..7feeda1a53 100644 --- a/srcpkgs/ccl/template +++ b/srcpkgs/ccl/template @@ -15,9 +15,13 @@ nopie=1 nostrip=1 disable_parallel_build=1 +case "${XBPS_TARGET_MACHINE}" in + i686*) broken="https://build.voidlinux.eu/builders/i686_builder/builds/5997/steps/shell_3/logs/stdio";; + *-musl) broken="https://build.voidlinux.eu/builders/i686_builder/builds/5997/steps/shell_3/logs/stdio";; +esac + case $XBPS_MACHINE in x86_64*) _arch=64 ;; - i686*) broken="https://build.voidlinux.eu/builders/i686_builder/builds/5997/steps/shell_3/logs/stdio" ;; *) _arch='' ;; esac