wallenstein/void-packages
1
0
Fork 0
mirror of https://github.com/void-linux/void-packages.git synced 2025-07-30 09:22:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

ccl: musl broken

Browse source
This commit is contained in:
Michael Gehring 2017-11-15 08:09:58 +00:00
parent 8f302e2391
commit 6239047703
2 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
srcpkgs/ccl/patches/glibc-2.26-ucontext.patch
View file

@ -1,22 +1,24 @@
--- lisp-kernel/platform-linuxx8632.h.orig 2015-11-06 20:10:11.000000000 +0000 --- 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 +++ 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_CPU PLATFORM_CPU_X86
#define PLATFORM_WORD_SIZE PLATFORM_WORD_SIZE_32 #define PLATFORM_WORD_SIZE PLATFORM_WORD_SIZE_32
-typedef struct ucontext ExceptionInformation; -typedef struct ucontext ExceptionInformation;
+typedef struct ucontext_t ExceptionInformation; +#include <ucontext.h>
+typedef ucontext_t ExceptionInformation;
#define MAXIMUM_MAPPABLE_MEMORY (9U<<28) #define MAXIMUM_MAPPABLE_MEMORY (9U<<28)
#define IMAGE_BASE_ADDRESS 0x10000000 #define IMAGE_BASE_ADDRESS 0x10000000
--- lisp-kernel/platform-linuxx8664.h.orig 2015-11-06 20:10:11.000000000 +0000 --- 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 +++ 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_CPU PLATFORM_CPU_X86
#define PLATFORM_WORD_SIZE PLATFORM_WORD_SIZE_64 #define PLATFORM_WORD_SIZE PLATFORM_WORD_SIZE_64
-typedef struct ucontext ExceptionInformation; -typedef struct ucontext ExceptionInformation;
+typedef struct ucontext_t ExceptionInformation; +#include <ucontext.h>
+typedef ucontext_t ExceptionInformation;
#define MAXIMUM_MAPPABLE_MEMORY (512L<<30L) #define MAXIMUM_MAPPABLE_MEMORY (512L<<30L)
#define IMAGE_BASE_ADDRESS 0x300000000000L #define IMAGE_BASE_ADDRESS 0x300000000000L
@ -27,7 +29,7 @@
void *puc; void *puc;
siginfo_t info; siginfo_t info;
- struct ucontext uc; - struct ucontext uc;
+ struct ucontext_t uc; + ucontext_t uc;
struct _fpstate fpstate; struct _fpstate fpstate;
char retcode[8]; char retcode[8];
}; };
@ -36,7 +38,7 @@
change copy_ucontext(). change copy_ucontext().
*/ */
- stack.ss_size -= sizeof(struct ucontext); - stack.ss_size -= sizeof(struct ucontext);
+ stack.ss_size -= sizeof(struct ucontext_t); + stack.ss_size -= sizeof(ucontext_t);
#endif #endif
if (sigaltstack(&stack, NULL) != 0) { if (sigaltstack(&stack, NULL) != 0) {
perror("sigaltstack"); perror("sigaltstack");

6
srcpkgs/ccl/template
View file

@ -15,9 +15,13 @@ nopie=1
nostrip=1 nostrip=1
disable_parallel_build=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 case $XBPS_MACHINE in
x86_64*) _arch=64 ;; x86_64*) _arch=64 ;;
i686*) broken="https://build.voidlinux.eu/builders/i686_builder/builds/5997/steps/shell_3/logs/stdio" ;;
*) _arch='' ;; *) _arch='' ;;
esac esac