aboutsummaryrefslogtreecommitdiffstats
path: root/community/blender/0001-musl-fixes.patch
diff options
context:
space:
mode:
Diffstat (limited to 'community/blender/0001-musl-fixes.patch')
-rw-r--r--community/blender/0001-musl-fixes.patch99
1 files changed, 7 insertions, 92 deletions
diff --git a/community/blender/0001-musl-fixes.patch b/community/blender/0001-musl-fixes.patch
index 6256340c754..00ef33a96c9 100644
--- a/community/blender/0001-musl-fixes.patch
+++ b/community/blender/0001-musl-fixes.patch
@@ -1,17 +1,11 @@
-From e51acbbc4317b60064014b12d00fc17b91243765 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
+From e6a0a6ae2d291630c81a5e657b99c640fe15516e Mon Sep 17 00:00:00 2001
+From: Leon Marz <main@lmarz.org>
+Date: Wed, 7 Dec 2022 21:18:58 +0100
+Subject: [PATCH 1/2] 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(-)
+ extern/glog/src/config_linux.h | 1 -
+ 1 file changed, 1 deletion(-)
diff --git a/extern/glog/src/config_linux.h b/extern/glog/src/config_linux.h
index b3a3325..946095a 100644
@@ -25,85 +19,6 @@ index b3a3325..946095a 100644
/* 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 f8b16ff..0bf7719 100644
---- a/intern/guardedalloc/intern/mallocn_intern.h
-+++ b/intern/guardedalloc/intern/mallocn_intern.h
-@@ -17,7 +17,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 85a6b43..28499a4 100644
---- a/intern/libc_compat/libc_compat.c
-+++ b/intern/libc_compat/libc_compat.c
-@@ -13,7 +13,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);
-@@ -112,5 +111,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 35e26e0..9a172dd 100644
---- a/source/blender/blenlib/intern/system.c
-+++ b/source/blender/blenlib/intern/system.c
-@@ -21,7 +21,9 @@
-
- # include "BLI_winstuff.h"
- #else
-+#if !defined(__MUSL__)
- # include <execinfo.h>
-+#endif
- # include <unistd.h>
- #endif
-
-@@ -63,7 +65,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 fe6ed7e..05cd7e0 100644
---- a/source/blender/gpu/GPU_vertex_buffer.h
-+++ b/source/blender/gpu/GPU_vertex_buffer.h
-@@ -133,7 +133,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 76423d7..af20437 100644
---- a/source/creator/creator_signals.c
-+++ b/source/creator/creator_signals.c
-@@ -258,7 +258,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.36.1
+2.44.0