[vlc-commits] [Git][videolan/vlc][master] meson: fix building on BSD's

[Marvin Scholz (@ePirat)]

Marvin Scholz pushed to branch master at VideoLAN / VLC


Commits:
911197c0 by Brad Smith at 2025-02-27T23:43:10+00:00
meson: fix building on BSD's

- - - - -


1 changed file:

- src/meson.build


Changes:

=====================================
src/meson.build
=====================================
@@ -348,7 +348,7 @@ elif host_system == 'windows'
             'win32/spawn.c',
         ]
     endif
-elif host_system == 'linux'
+else
     libvlccore_sources += [
         'posix/dirs.c',
         'posix/error.c',
@@ -361,13 +361,32 @@ elif host_system == 'linux'
         'posix/plugin.c',
         'posix/rand.c',
         'posix/timer.c',
-        'posix/sort.c',
-        'linux/cpu.c',
-        'linux/dirs.c',
-        'linux/filesystem.c',
-        'linux/thread.c',
     ]
 
+    if cdata.get('HAVE_QSORT_R', 0) == 1 or cdata.get('HAVE_BROKEN_QSORT_R', 0) == 1
+        libvlccore_sources += 'posix/sort.c'
+    endif
+
+    if host_system not in ['linux', 'freebsd']
+        libvlccore_sources += 'posix/wait.c'
+    endif
+
+    if host_system == 'linux'
+        libvlccore_sources += [
+            'linux/cpu.c',
+            'linux/dirs.c',
+            'linux/filesystem.c',
+            'linux/thread.c',
+        ]
+    endif
+
+    if host_system == 'freebsd'
+        libvlccore_sources += [
+            'freebsd/cpu.c',
+            'freebsd/thread.c',
+        ]
+    endif
+
     if anl_lib.found()
         libvlccore_sources += 'linux/getaddrinfo.c'
     else



View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/911197c03bcbadc00a7c0ebc48855db332e1de63

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/911197c03bcbadc00a7c0ebc48855db332e1de63
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance