mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-10-29 05:40:27 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

treewide: meson.build: use host_machine instead of build_machine

Browse source 
At the moment, cross compilation may not work in certain cases because
checks are carried out against the build machine instead of the host machine.
Replace uses of `build_machine` with `host_machine` to fix that.

In native compilation, all three "machine objects" available in meson
are the same, so this change should have no effect in that case.

More: https://mesonbuild.com/Cross-compilation.html
This commit is contained in:
Barnabás Pőcze 2022-08-16 18:03:03 +02:00 • committed by Wim Taymans
parent 358254f20a
commit 68ff3ad841
4 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
meson.build
View file

@ -342,11 +342,11 @@ summary({'WebRTC Echo Canceling': webrtc_dep.found()}, bool_yn: true, section: '
cdata.set('HAVE_WEBRTC', webrtc_dep.found()) cdata.set('HAVE_WEBRTC', webrtc_dep.found())
# On FreeBSD and MidnightBSD, epoll-shim library is required for eventfd() and timerfd() # On FreeBSD and MidnightBSD, epoll-shim library is required for eventfd() and timerfd()
epoll_shim_dep = (build_machine.system() == 'freebsd' or build_machine.system() == 'midnightbsd' epoll_shim_dep = (host_machine.system() == 'freebsd' or host_machine.system() == 'midnightbsd'
? dependency('epoll-shim', required: true) ? dependency('epoll-shim', required: true)
: dependency('', required: false)) : dependency('', required: false))
libinotify_dep = (build_machine.system() == 'freebsd' or build_machine.system() == 'midnightbsd' libinotify_dep = (host_machine.system() == 'freebsd' or host_machine.system() == 'midnightbsd'
? dependency('libinotify', required: true) ? dependency('libinotify', required: true)
: dependency('', required: false)) : dependency('', required: false))
@ -361,7 +361,7 @@ need_alsa = get_option('pipewire-alsa').enabled() or 'media-session' in get_opti
alsa_dep = dependency('alsa', version : '>=1.1.7', required: need_alsa) alsa_dep = dependency('alsa', version : '>=1.1.7', required: need_alsa)
summary({'pipewire-alsa': alsa_dep.found()}, bool_yn: true) summary({'pipewire-alsa': alsa_dep.found()}, bool_yn: true)
if build_machine.system() == 'freebsd' or build_machine.system() == 'midnightbsd' if host_machine.system() == 'freebsd' or host_machine.system() == 'midnightbsd'
# On FreeBSD and MidnightBSD the OpenSSL library may come from base or a package. # On FreeBSD and MidnightBSD the OpenSSL library may come from base or a package.
# Check for a package first and fallback to the base library if we can't find it via pkgconfig # Check for a package first and fallback to the base library if we can't find it via pkgconfig
openssl_lib = dependency('openssl', required: false) openssl_lib = dependency('openssl', required: false)

2
spa/plugins/meson.build
View file

@ -1,7 +1,7 @@
if alsa_dep.found() if alsa_dep.found()
subdir('alsa') subdir('alsa')
endif endif
if get_option('avb').require(build_machine.system() == 'linux', error_message: 'AVB support is only available on Linux').allowed() if get_option('avb').require(host_machine.system() == 'linux', error_message: 'AVB support is only available on Linux').allowed()
subdir('avb') subdir('avb')
endif endif
if get_option('audioconvert').allowed() if get_option('audioconvert').allowed()

2
src/modules/meson.build
View file

@ -527,7 +527,7 @@ pipewire_module_fallback_sink = shared_library('pipewire-module-fallback-sink',
dependencies : [mathlib, dl_lib, rt_lib, pipewire_dep], dependencies : [mathlib, dl_lib, rt_lib, pipewire_dep],
) )
build_module_avb = get_option('avb').require(build_machine.system() == 'linux', error_message: 'AVB support is only available on Linux').allowed() build_module_avb = get_option('avb').require(host_machine.system() == 'linux', error_message: 'AVB support is only available on Linux').allowed()
if build_module_avb if build_module_avb
pipewire_module_avb = shared_library('pipewire-module-avb', pipewire_module_avb = shared_library('pipewire-module-avb',
[ 'module-avb.c', [ 'module-avb.c',

2
src/pipewire/meson.build
View file

@ -94,7 +94,7 @@ libpipewire_c_args = [
'-DOLD_MEDIA_SESSION_WORKAROUND=1' '-DOLD_MEDIA_SESSION_WORKAROUND=1'
] ]
if build_machine.system() != 'freebsd' and build_machine.system() != 'midnightbsd' if host_machine.system() != 'freebsd' and host_machine.system() != 'midnightbsd'
libpipewire_c_args += [ libpipewire_c_args += [
'-D_POSIX_C_SOURCE' '-D_POSIX_C_SOURCE'
] ]