Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add support for the musl libc. #1239

Closed
wants to merge 4 commits into from
Closed

Add support for the musl libc. #1239

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5269722
Linux: Add JUCE_GLIBC and JUCE_MUSL macros
vimproved Jun 15, 2023
c596bb6
SystemStats: Do not use execinfo.h on JUCE_MUSL
vimproved Jun 15, 2023
359db9d
Native: Only use stat64 on glibc and iOS
vimproved Jun 15, 2023
54ca4ae
SystemStats: Only use locales on glibc
vimproved Jun 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion modules/juce_core/juce_core.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@
#include <net/if.h>
#include <sys/ioctl.h>

#if ! (JUCE_ANDROID || JUCE_WASM)
#if ! (JUCE_ANDROID || JUCE_WASM || JUCE_MUSL)
#include <execinfo.h>
#endif
#endif
Expand Down
2 changes: 1 addition & 1 deletion modules/juce_core/native/juce_SharedCode_posix.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ int juce_siginterrupt ([[maybe_unused]] int sig, [[maybe_unused]] int flag)
//==============================================================================
namespace
{
#if JUCE_LINUX || (JUCE_IOS && (! TARGET_OS_MACCATALYST) && (! __DARWIN_ONLY_64_BIT_INO_T)) // (this iOS stuff is to avoid a simulator bug)
#if JUCE_GLIBC || (JUCE_IOS && (! TARGET_OS_MACCATALYST) && (! __DARWIN_ONLY_64_BIT_INO_T)) // (this iOS stuff is to avoid a simulator bug)
using juce_statStruct = struct stat64;
#define JUCE_STAT stat64
#else
Expand Down
12 changes: 6 additions & 6 deletions modules/juce_core/native/juce_SystemStats_linux.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,22 +198,22 @@ String SystemStats::getComputerName()

String SystemStats::getUserLanguage()
{
#if JUCE_BSD
#if JUCE_GLIBC
return getLocaleValue (_NL_ADDRESS_LANG_AB);
#else
if (auto langEnv = getenv ("LANG"))
return String::fromUTF8 (langEnv).upToLastOccurrenceOf (".UTF-8", false, true);

return {};
#else
return getLocaleValue (_NL_ADDRESS_LANG_AB);
#endif
}

String SystemStats::getUserRegion()
{
#if JUCE_BSD
return {};
#else
#if JUCE_GLIBC
return getLocaleValue (_NL_ADDRESS_COUNTRY_AB2);
#else
return {};
#endif
}

Expand Down
2 changes: 1 addition & 1 deletion modules/juce_core/system/juce_SystemStats.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ String SystemStats::getStackBacktrace()
{
String result;

#if JUCE_ANDROID || JUCE_MINGW || JUCE_WASM
#if JUCE_ANDROID || JUCE_MINGW || JUCE_WASM || JUCE_MUSL
jassertfalse; // sorry, not implemented yet!

#elif JUCE_WINDOWS
Expand Down
9 changes: 9 additions & 0 deletions modules/juce_core/system/juce_TargetPlatform.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
- Either JUCE_LITTLE_ENDIAN or JUCE_BIG_ENDIAN.
- Either JUCE_INTEL or JUCE_ARM
- Either JUCE_GCC or JUCE_CLANG or JUCE_MSVC
- Either JUCE_GLIBC or JUCE_MUSL will be defined on Linux depending on the system's libc implementation.
*/

//==============================================================================
Expand Down Expand Up @@ -183,6 +184,14 @@
#elif __MMX__ || __SSE__ || __amd64__
#define JUCE_INTEL 1
#endif

#if JUCE_LINUX
#ifdef __GLIBC__
#define JUCE_GLIBC 1
#else
#define JUCE_MUSL 1
#endif
#endif
#endif

//==============================================================================
Expand Down