diff options
| author | Yuri Sizov <11782833+YuriSizov@users.noreply.github.com> | 2023-03-27 20:14:47 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-27 20:14:47 +0200 |
| commit | 19501f8eb19481b029f67ecf78e711d42f2fc431 (patch) | |
| tree | 933ea3320b35bce6ba65ab1e1d1aa8ad662c90d4 /platform/linuxbsd/detect.py | |
| parent | cacf49999e3fb37281d66cc591ca8bebc5712d4d (diff) | |
| parent | 843f5adbc523ad2511322b4f09b5ce5a3fb9e225 (diff) | |
Merge pull request #75397 from YuriSizov/4.0-cherrypicks
Cherry-picks for the 4.0 branch (future 4.0.2) - 1st batch
Diffstat (limited to 'platform/linuxbsd/detect.py')
| -rw-r--r-- | platform/linuxbsd/detect.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/platform/linuxbsd/detect.py b/platform/linuxbsd/detect.py index e203dca005..54351757cd 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_<name>=no` for all of them, or none." ) - sys.exit() + sys.exit(255) if not env["builtin_freetype"]: env.ParseConfig("pkg-config freetype2 --cflags --libs") @@ -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"]: |