mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-01-12 02:15:31 +00:00
meson: check for libsocket and libnsl
If present, add '-lsocket' and '-lnsl' to network_deps. ext/curl/meson.build: add network_deps to dependencies gst/festival/meson.build: same sys/shm/meson.build: same Fixes linking issues on Illumos distros. Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1736>
This commit is contained in:
parent
7444fcdb00
commit
7326dc4af2
4 changed files with 17 additions and 3 deletions
|
@ -23,7 +23,7 @@ if curl_dep.found()
|
||||||
curl_sources,
|
curl_sources,
|
||||||
c_args : gst_plugins_bad_args,
|
c_args : gst_plugins_bad_args,
|
||||||
include_directories : [configinc, libsinc],
|
include_directories : [configinc, libsinc],
|
||||||
dependencies : [gstbase_dep, curl_dep] + winsock2,
|
dependencies : [gstbase_dep, curl_dep] + winsock2 + network_deps,
|
||||||
install : true,
|
install : true,
|
||||||
install_dir : plugins_install_dir,
|
install_dir : plugins_install_dir,
|
||||||
)
|
)
|
||||||
|
|
|
@ -6,7 +6,7 @@ gstfestival = library('gstfestival',
|
||||||
festival_sources,
|
festival_sources,
|
||||||
c_args : gst_plugins_bad_args,
|
c_args : gst_plugins_bad_args,
|
||||||
include_directories : [configinc],
|
include_directories : [configinc],
|
||||||
dependencies : [gstbase_dep, gstaudio_dep] + winsock2,
|
dependencies : [gstbase_dep, gstaudio_dep] + winsock2 + network_deps,
|
||||||
install : true,
|
install : true,
|
||||||
install_dir : plugins_install_dir,
|
install_dir : plugins_install_dir,
|
||||||
)
|
)
|
||||||
|
|
|
@ -377,6 +377,20 @@ if x11_dep.found()
|
||||||
cdata.set('HAVE_X11', 1)
|
cdata.set('HAVE_X11', 1)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
#
|
||||||
|
# Solaris and Illumos distros split a lot of networking-related code
|
||||||
|
# into '-lsocket -lnsl'. Anything that calls socketpair(), getifaddr(),
|
||||||
|
# etc. probably needs to include network_deps
|
||||||
|
#
|
||||||
|
if host_machine.system() == 'sunos'
|
||||||
|
network_deps = [
|
||||||
|
cc.find_library('socket', required: false),
|
||||||
|
cc.find_library('nsl', required: false)
|
||||||
|
]
|
||||||
|
else
|
||||||
|
network_deps = []
|
||||||
|
endif
|
||||||
|
|
||||||
if host_machine.system() == 'windows'
|
if host_machine.system() == 'windows'
|
||||||
winsock2 = [cc.find_library('ws2_32')]
|
winsock2 = [cc.find_library('ws2_32')]
|
||||||
else
|
else
|
||||||
|
|
|
@ -36,7 +36,7 @@ if shm_enabled
|
||||||
shm_sources,
|
shm_sources,
|
||||||
c_args : gst_plugins_bad_args + ['-DSHM_PIPE_USE_GLIB'],
|
c_args : gst_plugins_bad_args + ['-DSHM_PIPE_USE_GLIB'],
|
||||||
include_directories : [configinc],
|
include_directories : [configinc],
|
||||||
dependencies : [gstbase_dep, rt_dep],
|
dependencies : [gstbase_dep, rt_dep] + network_deps,
|
||||||
install : true,
|
install : true,
|
||||||
install_dir : plugins_install_dir,
|
install_dir : plugins_install_dir,
|
||||||
)
|
)
|
||||||
|
|
Loading…
Reference in a new issue