From 597b83aedf8f33e4112de7162f3e68ca1236d138 Mon Sep 17 00:00:00 2001 From: Omar Polo Date: Thu, 9 Mar 2023 09:56:50 +0100 Subject: change some sys.exit() to be fatal - when not all freetype deps are builtin (or provided externally) - when attempting to build on an unsupported CPU architecture (cherry picked from commit ac04a0761ebdb8c7754d09a3b687900f8b5c0009) --- platform/linuxbsd/detect.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'platform/linuxbsd/detect.py') diff --git a/platform/linuxbsd/detect.py b/platform/linuxbsd/detect.py index e203dca005..549319a750 100644 --- a/platform/linuxbsd/detect.py +++ b/platform/linuxbsd/detect.py @@ -70,7 +70,7 @@ def configure(env: "Environment"): 'Unsupported CPU architecture "%s" for Linux / *BSD. Supported architectures are: %s.' % (env["arch"], ", ".join(supported_arches)) ) - sys.exit() + sys.exit(255) ## Build type @@ -208,7 +208,7 @@ def configure(env: "Environment"): "freetype, libpng, zlib, graphite, harfbuzz.\n" "Please specify `builtin_=no` for all of them, or none." ) - sys.exit() + sys.exit(255) if not env["builtin_freetype"]: env.ParseConfig("pkg-config freetype2 --cflags --libs") -- cgit v1.2.3 From 516323f4ab139f07c9a46bb35ebb71dc3df5509b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Thu, 9 Mar 2023 16:05:52 +0100 Subject: SCons: Cleanup pulseaudio defines for Linux No need to define _REENTRANT manually when using the system lib, it's part of the pkgconfig cflags. And we were then defining PULSEAUDIO_ENABLED twice. (cherry picked from commit a35586779e716e6f625e7b1b66c6e03d4a4306b3) --- platform/linuxbsd/detect.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'platform/linuxbsd/detect.py') diff --git a/platform/linuxbsd/detect.py b/platform/linuxbsd/detect.py index 549319a750..54351757cd 100644 --- a/platform/linuxbsd/detect.py +++ b/platform/linuxbsd/detect.py @@ -307,11 +307,12 @@ def configure(env: "Environment"): if not env["use_sowrap"]: if os.system("pkg-config --exists libpulse") == 0: # 0 means found env.ParseConfig("pkg-config libpulse --cflags --libs") - env.Append(CPPDEFINES=["PULSEAUDIO_ENABLED", "_REENTRANT"]) + env.Append(CPPDEFINES=["PULSEAUDIO_ENABLED"]) else: print("Warning: PulseAudio development libraries not found. Disabling the PulseAudio audio driver.") env["pulseaudio"] = False - env.Append(CPPDEFINES=["PULSEAUDIO_ENABLED", "_REENTRANT"]) + else: + env.Append(CPPDEFINES=["PULSEAUDIO_ENABLED", "_REENTRANT"]) if env["dbus"]: if not env["use_sowrap"]: -- cgit v1.2.3