Skip to content

Commit

Permalink
CMake: support building with musl libc
Browse files Browse the repository at this point in the history
Instead of using macros like GLIBC we can use the CMake build
systems internal functions to check if some header or functions are
present on the running system's libc.

Add ./build_files/cmake/have_features.cmake to add checks for
platform features which can be used to set defines for source
files that require them.

Reviewed By: campbellbarton

Ref D15696
  • Loading branch information
listout authored and ideasman42 committed Aug 17, 2022
1 parent 0a84cc6 commit f197b1a
Show file tree
Hide file tree
Showing 10 changed files with 69 additions and 7 deletions.
6 changes: 6 additions & 0 deletions CMakeLists.txt
Expand Up @@ -105,6 +105,12 @@ blender_project_hack_post()

enable_testing()

#-----------------------------------------------------------------------------
# Test compiler/library features.

include(build_files/cmake/have_features.cmake)


#-----------------------------------------------------------------------------
# Redirect output files

Expand Down
33 changes: 33 additions & 0 deletions build_files/cmake/have_features.cmake
@@ -0,0 +1,33 @@
# SPDX-License-Identifier: GPL-2.0-or-later
# Copyright 2022 Blender Foundation. All rights reserved.

# This file is used to test the system for headers & symbols.
# Variables should use the `HAVE_` prefix.
# Defines should use the same name as the CMAKE variable.

include(CheckSymbolExists)

# Used for: `intern/guardedalloc/intern/mallocn_intern.h`.
# Function `malloc_stats` is only available on GLIBC,
# so check that before defining `HAVE_MALLOC_STATS`.
check_symbol_exists(malloc_stats "malloc.h" HAVE_MALLOC_STATS_H)

# Used for: `source/creator/creator_signals.c`.
# The function `feenableexcept` is not present non-GLIBC systems,
# hence we need to check if it's available in the `fenv.h` file.
set(HAVE_FEENABLEEXCEPT OFF)
if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
check_symbol_exists(feenableexcept "fenv.h" HAVE_FEENABLEEXCEPT)
endif()

# Used for: `source/blender/blenlib/intern/system.c`.
# `execinfo` is not available on non-GLIBC systems (at least not on MUSL-LIBC),
# so check the presence of the header before including it and using the it for back-trace.
set(HAVE_EXECINFO_H OFF)
if(NOT MSVC)
include(CheckIncludeFiles)
check_include_files("execinfo.h" HAVE_EXECINFO_H)
if(HAVE_EXECINFO_H)
add_definitions(-DHAVE_EXECINFO_H)
endif()
endif()
4 changes: 4 additions & 0 deletions intern/guardedalloc/CMakeLists.txt
@@ -1,6 +1,10 @@
# SPDX-License-Identifier: GPL-2.0-or-later
# Copyright 2006 Blender Foundation. All rights reserved.

if(HAVE_MALLOC_STATS_H)
add_definitions(-DHAVE_MALLOC_STATS_H)
endif()

set(INC
.
../atomic
Expand Down
3 changes: 1 addition & 2 deletions intern/guardedalloc/intern/mallocn_intern.h
Expand Up @@ -17,8 +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__)) || \
defined(__GLIBC__)
#if defined(HAVE_MALLOC_STATS_H)
# include <malloc.h>
# define HAVE_MALLOC_STATS
#elif defined(__FreeBSD__)
Expand Down
4 changes: 4 additions & 0 deletions source/blender/blenlib/CMakeLists.txt
@@ -1,6 +1,10 @@
# SPDX-License-Identifier: GPL-2.0-or-later
# Copyright 2006 Blender Foundation. All rights reserved.

if(HAVE_EXECINFO_H)
add_definitions(-DHAVE_EXECINFO_H)
endif()

set(INC
.
# ../blenkernel # don't add this back!
Expand Down
10 changes: 6 additions & 4 deletions source/blender/blenlib/intern/system.c
Expand Up @@ -21,7 +21,9 @@

# include "BLI_winstuff.h"
#else
# include <execinfo.h>
# if defined(HAVE_EXECINFO_H)
# include <execinfo.h>
# endif
# include <unistd.h>
#endif

Expand Down Expand Up @@ -61,9 +63,9 @@ int BLI_cpu_support_sse2(void)
#if !defined(_MSC_VER)
void BLI_system_backtrace(FILE *fp)
{
/* ------------- */
/* Linux / Apple */
# if defined(__linux__) || defined(__APPLE__)
/* ----------------------- */
/* If system as execinfo.h */
# if defined(HAVE_EXECINFO_H)

# define SIZE 100
void *buffer[SIZE];
Expand Down
5 changes: 5 additions & 0 deletions source/blender/makesdna/intern/CMakeLists.txt
Expand Up @@ -5,6 +5,11 @@

add_definitions(-DWITH_DNA_GHASH)

# Needed for `mallocn.c`.
if(HAVE_MALLOC_STATS_H)
add_definitions(-DHAVE_MALLOC_STATS_H)
endif()

blender_include_dirs(
../../../../intern/atomic
../../../../intern/guardedalloc
Expand Down
5 changes: 5 additions & 0 deletions source/blender/makesrna/intern/CMakeLists.txt
Expand Up @@ -6,6 +6,11 @@ if(CMAKE_COMPILER_IS_GNUCC)
string(APPEND CMAKE_C_FLAGS " -Werror=implicit-function-declaration")
endif()

# Needed for `mallocn.c`.
if(HAVE_MALLOC_STATS_H)
add_definitions(-DHAVE_MALLOC_STATS_H)
endif()

# files rna_access.c rna_define.c makesrna.c intentionally excluded.
set(DEFSRC
rna_ID.c
Expand Down
4 changes: 4 additions & 0 deletions source/creator/CMakeLists.txt
Expand Up @@ -21,6 +21,10 @@ set(LIB
bf_windowmanager
)

if(HAVE_FEENABLEEXCEPT)
add_definitions(-DHAVE_FEENABLEEXCEPT)
endif()

if(WITH_TBB)
# Force TBB libraries to be in front of MKL (part of OpenImageDenoise), so
# that it is initialized before MKL and static library initialization order
Expand Down
2 changes: 1 addition & 1 deletion source/creator/creator_signals.c
Expand Up @@ -256,7 +256,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(HAVE_FEENABLEEXCEPT)
feenableexcept(FE_DIVBYZERO | FE_INVALID | FE_OVERFLOW);
# endif /* defined(__linux__) && defined(__GNUC__) */
# if defined(OSX_SSE_FPE)
Expand Down

0 comments on commit f197b1a

Please sign in to comment.