GLibC Compat: Add deprecated memory hooks symbols removed from 2.34.
Starting from GLibC 2.34, deprecated `__malloc_hook` & co. have been removed from headers, while still present in the shared library itself. This means that it is no more possible to build Blender with USD 22.03 on recent linux systems. While USD 22.08 has a fix to this issue, it is unlikely to be upgraded for Blender 3.4, and definitely not for Blender 3.3. This commit ensures Blender can build with USD 22.03 and glibc >= 2.34. Ref.: T99618, https://devtalk.blender.org/t/building-blender-on-linux-using-glibc-2-34-raises-linking-errors-from-the-usd-library/24185 Patch by @brecht, many thanks.
This commit is contained in:
parent
ec2e866aee
commit
16af35054d
|
@ -12,6 +12,7 @@
|
|||
#ifdef __linux__
|
||||
# include <features.h>
|
||||
# include <math.h>
|
||||
# include <stdlib.h>
|
||||
|
||||
# if defined(__GLIBC_PREREQ)
|
||||
# if __GLIBC_PREREQ(2, 31)
|
||||
|
@ -114,5 +115,15 @@ float __powf_finite(float x, float y)
|
|||
}
|
||||
|
||||
# endif /* __GLIBC_PREREQ(2, 31) */
|
||||
|
||||
# if __GLIBC_PREREQ(2, 34)
|
||||
|
||||
void *(*__malloc_hook)(size_t __size, const void *) = NULL;
|
||||
void *(*__realloc_hook)(void *__ptr, size_t __size, const void *) = NULL;
|
||||
void *(*__memalign_hook)(size_t __alignment, size_t __size, const void *) = NULL;
|
||||
void (*__free_hook)(void *__ptr, const void *) = NULL;
|
||||
|
||||
# endif /* __GLIBC_PREREQ(2, 34) */
|
||||
|
||||
# endif /* __GLIBC_PREREQ */
|
||||
#endif /* __linux__ */
|
||||
|
|
Loading…
Reference in New Issue