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') 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