mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-09-21 21:51:34 +02:00
110 lines
3.7 KiB
Diff
110 lines
3.7 KiB
Diff
From 06658b22a0f8794ce1b2650e84f8027f68dc796e Mon Sep 17 00:00:00 2001
|
|
From: Leon Marz <lmarz@cs.uni-frankfurt.de>
|
|
Date: Wed, 25 Nov 2020 10:10:41 +0100
|
|
Subject: [PATCH 1/3] musl fixes
|
|
|
|
Original patch by Nathanael Copa
|
|
---
|
|
extern/glog/src/config_linux.h | 1 -
|
|
intern/guardedalloc/intern/mallocn_intern.h | 2 +-
|
|
intern/libc_compat/libc_compat.c | 2 --
|
|
source/blender/blenlib/intern/system.c | 4 +++-
|
|
source/blender/gpu/GPU_vertex_buffer.h | 1 -
|
|
source/creator/creator_signals.c | 2 +-
|
|
6 files changed, 5 insertions(+), 7 deletions(-)
|
|
|
|
diff --git a/extern/glog/src/config_linux.h b/extern/glog/src/config_linux.h
|
|
index b3a3325..946095a 100644
|
|
--- a/extern/glog/src/config_linux.h
|
|
+++ b/extern/glog/src/config_linux.h
|
|
@@ -14,7 +14,6 @@
|
|
#define HAVE_DLFCN_H
|
|
|
|
/* Define to 1 if you have the <execinfo.h> header file. */
|
|
-#define HAVE_EXECINFO_H
|
|
|
|
/* Define if you have the `fcntl' function */
|
|
#define HAVE_FCNTL
|
|
diff --git a/intern/guardedalloc/intern/mallocn_intern.h b/intern/guardedalloc/intern/mallocn_intern.h
|
|
index b57e11d..5a1a662 100644
|
|
--- a/intern/guardedalloc/intern/mallocn_intern.h
|
|
+++ b/intern/guardedalloc/intern/mallocn_intern.h
|
|
@@ -33,7 +33,7 @@
|
|
#undef HAVE_MALLOC_STATS
|
|
#define USE_MALLOC_USABLE_SIZE /* internal, when we have malloc_usable_size() */
|
|
|
|
-#if defined(__linux__) || (defined(__FreeBSD_kernel__) && !defined(__FreeBSD__)) || \
|
|
+#if defined(__linux__) && !defined(__MUSL__) || (defined(__FreeBSD_kernel__) && !defined(__FreeBSD__)) || \
|
|
defined(__GLIBC__)
|
|
# include <malloc.h>
|
|
# define HAVE_MALLOC_STATS
|
|
diff --git a/intern/libc_compat/libc_compat.c b/intern/libc_compat/libc_compat.c
|
|
index 0bf2287..300f9d8 100644
|
|
--- a/intern/libc_compat/libc_compat.c
|
|
+++ b/intern/libc_compat/libc_compat.c
|
|
@@ -29,7 +29,6 @@
|
|
# include <features.h>
|
|
# include <math.h>
|
|
|
|
-# if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 31)
|
|
|
|
double __exp_finite(double x);
|
|
double __exp2_finite(double x);
|
|
@@ -128,5 +127,4 @@ float __powf_finite(float x, float y)
|
|
return powf(x, y);
|
|
}
|
|
|
|
-# endif /* __GLIBC_PREREQ */
|
|
#endif /* __linux__ */
|
|
diff --git a/source/blender/blenlib/intern/system.c b/source/blender/blenlib/intern/system.c
|
|
index e64d534..dd8b1dd 100644
|
|
--- a/source/blender/blenlib/intern/system.c
|
|
+++ b/source/blender/blenlib/intern/system.c
|
|
@@ -35,7 +35,9 @@
|
|
|
|
# include "BLI_winstuff.h"
|
|
#else
|
|
+#if !defined(__MUSL__)
|
|
# include <execinfo.h>
|
|
+#endif
|
|
# include <unistd.h>
|
|
#endif
|
|
|
|
@@ -77,7 +79,7 @@ void BLI_system_backtrace(FILE *fp)
|
|
{
|
|
/* ------------- */
|
|
/* Linux / Apple */
|
|
-# if defined(__linux__) || defined(__APPLE__)
|
|
+# if defined(__linux__) && !defined(__MUSL__) || defined(__APPLE__)
|
|
|
|
# define SIZE 100
|
|
void *buffer[SIZE];
|
|
diff --git a/source/blender/gpu/GPU_vertex_buffer.h b/source/blender/gpu/GPU_vertex_buffer.h
|
|
index 43a8e7f..588ac25 100644
|
|
--- a/source/blender/gpu/GPU_vertex_buffer.h
|
|
+++ b/source/blender/gpu/GPU_vertex_buffer.h
|
|
@@ -149,7 +149,6 @@ GPU_INLINE void *GPU_vertbuf_raw_step(GPUVertBufRaw *a)
|
|
{
|
|
unsigned char *data = a->data;
|
|
a->data += a->stride;
|
|
- BLI_assert(data < a->_data_end);
|
|
return (void *)data;
|
|
}
|
|
|
|
diff --git a/source/creator/creator_signals.c b/source/creator/creator_signals.c
|
|
index c23664d..e1ae188 100644
|
|
--- a/source/creator/creator_signals.c
|
|
+++ b/source/creator/creator_signals.c
|
|
@@ -272,7 +272,7 @@ void main_signal_setup_fpe(void)
|
|
* set breakpoints on sig_handle_fpe */
|
|
signal(SIGFPE, sig_handle_fpe);
|
|
|
|
-# if defined(__linux__) && defined(__GNUC__)
|
|
+# if defined(__linux__) && defined(__GNUC__) && !defined(__MUSL__)
|
|
feenableexcept(FE_DIVBYZERO | FE_INVALID | FE_OVERFLOW);
|
|
# endif /* defined(__linux__) && defined(__GNUC__) */
|
|
# if defined(OSX_SSE_FPE)
|
|
--
|
|
2.35.1
|
|
|