build-sys: meson: Add some missing checks

- Header and function checks from configure.ac
  (some libc, some libpthread, dladdr from libdl)
- Find iconv and check constness
This commit is contained in:
Jan Alexander Steffens (heftig) 2019-08-08 20:23:12 +02:00
parent 91fb54dab1
commit 493e7f3582
No known key found for this signature in database
GPG key ID: A5E9288C4FA415FA
6 changed files with 65 additions and 8 deletions

View file

@ -31,7 +31,7 @@ executable('pulseaudio',
include_directories : [configinc, topinc],
link_args : ['-ffast-math'],
link_with : [libpulsecore, libpulsecommon, libpulse],
dependencies : [ltdl_dep, cap_dep, dbus_dep, libsystemd_dep],
dependencies : [ltdl_dep, cap_dep, dbus_dep, libsystemd_dep, dl_dep],
c_args : pa_c_args,
)

View file

@ -181,7 +181,10 @@ libpulsecommon = shared_library('pulsecommon-' + pa_version_major_minor,
link_args : [nodelete_link_args],
install : true,
install_dir : privlibdir,
dependencies : [libm_dep, thread_dep, shm_dep, sndfile_dep, dbus_dep, x11_dep, libsystemd_dep, glib_dep, gtk_dep, asyncns_dep],
dependencies : [
libm_dep, thread_dep, dl_dep, shm_dep, iconv_dep, sndfile_dep, dbus_dep,
x11_dep, libsystemd_dep, glib_dep, gtk_dep, asyncns_dep
],
implicit_include_directories : false)
libpulsecommon_dep = declare_dependency(link_with: libpulsecommon)

View file

@ -81,7 +81,7 @@ libpulse = shared_library('pulse',
link_args : [nodelete_link_args, versioning_link_args],
install : true,
install_rpath : privlibdir,
dependencies : [libm_dep, thread_dep, libpulsecommon_dep, dbus_dep],
dependencies : [libm_dep, thread_dep, libpulsecommon_dep, dbus_dep, dl_dep, iconv_dep],
implicit_include_directories : false)
libpulse_dep = declare_dependency(link_with: libpulse)

View file

@ -127,7 +127,7 @@ norun_tests = [
[ 'remix-test', 'remix-test.c',
[ libpulse_dep, libpulsecommon_dep, libpulsecore_dep ] ],
[ 'rtstutter', 'rtstutter.c',
[ libpulse_dep, libpulsecommon_dep, libpulsecore_dep ] ],
[ thread_dep, libpulse_dep, libpulsecommon_dep, libpulsecore_dep ] ],
[ 'sig2str-test', 'sig2str-test.c',
[ check_dep, libpulse_dep, libpulsecommon_dep, libpulsecore_dep ] ],
[ 'stripnul', 'stripnul.c',

View file

@ -94,8 +94,8 @@ if cc.has_header('sys/soundcard.h')
install_rpath : privlibdir,
include_directories : [configinc, topinc],
link_with : [libpulsecommon, libpulse],
link_args : [nodelete_link_args, '-ldl'],
dependencies: [thread_dep],
link_args : [nodelete_link_args],
dependencies: [thread_dep, dl_dep],
c_args : [pa_c_args, '-Wno-nonnull-compare']
)