fix: add pthread dependency if either JACK or ALSA support will be compiled in

Signed-off-by: Christopher Arndt <[email protected]>

Author: SpotlightKid

meson.build

@@ -24,7 +24,6 @@ else
     jack_dep = disabler()
 endif
 
-
 jack_not_found = jack_dep.found() ? false : true
 
 ## From https://github.com/numpy/numpy/blob/main/numpy/meson.build
@@ -65,9 +64,15 @@ else
 
     # API
     alsa_dep = dependency('alsa', required: jack_not_found)
-    threads_dep = dependency('threads')
 endif # Platform detection
 
+jack_support = jack_dep.found() and get_option('jack')
+alsa_support = host_machine.system() == 'linux' and alsa_dep.found() and get_option('alsa')
+coremidi_support = host_machine.system() == 'darwin' and coremidi_dep.found() and get_option('coremidi')
+winmm_support = host_machine.system() == 'windows' and winmm_dep.found() and get_option('winmm')
+
+threads_dep = dependency('threads', required: alsa_support or jack_support)
+
 pymod = import('python')
 python = pymod.find_installation(get_option('python'), required: true)
 
@@ -85,9 +90,9 @@ endif
 summary({
     'Debug messages (verbose)': get_option('verbose'),
     'Build for wheel': get_option('wheel'),
-    'JACK support': jack_dep.found() and get_option('jack'),
-    'ALSA support': host_machine.system() == 'linux' and alsa_dep.found() and get_option('alsa'),
-    'CoreMIDI support': host_machine.system() == 'darwin' and coremidi_dep.found() and get_option('coremidi'),
-    'Window MM support': host_machine.system() == 'windows' and winmm_dep.found() and get_option('winmm'),
+    'JACK support': jack_support,
+    'ALSA support': alsa_support,
+    'CoreMIDI support': coremidi_support,
+    'Window MM support': winmm_support,
 }, section: 'Configuration')
 

rtmidi/meson.build

@@ -4,7 +4,7 @@ defines = []
 dependencies = [python.dependency()]
 link_args = []
 
-if host_machine.system() == 'darwin' and coremidi_dep.found() and get_option('coremidi')
+if coremidi_support
     defines += ['-D__MACOSX_CORE__']
     #defines += ['-frtti']
     dependencies += [coremidi_dep]
@@ -15,24 +15,24 @@ if host_machine.system() == 'darwin' and coremidi_dep.found() and get_option('co
     ]
 endif
 
-if host_machine.system() == 'linux'
+if alsa_support or jack_support
     dependencies += [threads_dep]
 endif
 
-if host_machine.system() == 'linux' and alsa_dep.found() and get_option('alsa')
+if alsa_support
     defines += ['-D__LINUX_ALSA__']
     dependencies += [alsa_dep]
 endif
 
-if host_machine.system() == 'windows' and get_option('winmm')
+if winmm_support
     defines += ['-D__WINDOWS_MM__']
     if meson.get_compiler('cpp').get_id() != 'gcc'
         defines += ['/EHsc']
     endif
     dependencies += [winmm_dep]
 endif
 
-if jack_dep.found() and get_option('jack')
+if jack_support
     defines += ['-D__UNIX_JACK__', '-DJACK_HAS_PORT_RENAME']
     dependencies += [jack_dep]
 endif