mirror of
https://gitlab.freedesktop.org/xorg/xserver.git
synced 2025-12-24 11:20:05 +01:00
191e79afea
This avoids warnings from system headers when building with debian bullseye:
In file included from ../dist-unpack/xserver-21.1.99.1/os/rpcauth.c:47:
/usr/include/tirpc/rpc/rpc.h:83:12: error: redundant redeclaration of ‘bindresvport’ [-Werror=redundant-decls]
83 | extern int bindresvport(int, struct sockaddr_in *);
| ^~~~~~~~~~~~
In file included from /usr/include/tirpc/rpc/rpc.h:40,
from ../dist-unpack/xserver-21.1.99.1/os/rpcauth.c:47:
/usr/include/netinet/in.h:503:12: note: previous declaration of ‘bindresvport’ was here
503 | extern int bindresvport (int __sockfd, struct sockaddr_in *__sock_in) __THROW;
| ^~~~~~~~~~~~
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
108 lines
2.5 KiB
Meson
108 lines
2.5 KiB
Meson
srcs_os = [
|
|
'WaitFor.c',
|
|
'access.c',
|
|
'auth.c',
|
|
'backtrace.c',
|
|
'client.c',
|
|
'connection.c',
|
|
'inputthread.c',
|
|
'io.c',
|
|
'mitauth.c',
|
|
'oscolor.c',
|
|
'osinit.c',
|
|
'ospoll.c',
|
|
'utils.c',
|
|
'xdmauth.c',
|
|
'xsha1.c',
|
|
'xstrans.c',
|
|
'xprintf.c',
|
|
'log.c',
|
|
]
|
|
|
|
# Wrapper code for missing C library functions. Note that conf_data contains either '1' or false.
|
|
srcs_libc = []
|
|
if conf_data.get('HAVE_REALLOCARRAY').to_int() == 0
|
|
srcs_libc += 'reallocarray.c'
|
|
endif
|
|
if conf_data.get('HAVE_STRCASECMP').to_int() == 0
|
|
srcs_libc += 'strcasecmp.c'
|
|
endif
|
|
if conf_data.get('HAVE_STRCASESTR').to_int() == 0
|
|
srcs_libc += 'strcasestr.c'
|
|
endif
|
|
if conf_data.get('HAVE_STRLCAT').to_int() == 0
|
|
srcs_libc += 'strlcat.c'
|
|
endif
|
|
if conf_data.get('HAVE_STRLCPY').to_int() == 0
|
|
srcs_libc += 'strlcpy.c'
|
|
endif
|
|
if conf_data.get('HAVE_STRNDUP').to_int() == 0
|
|
srcs_libc += 'strndup.c'
|
|
endif
|
|
if conf_data.get('HAVE_TIMINGSAFE_MEMCMP').to_int() == 0
|
|
srcs_libc += 'timingsafe_memcmp.c'
|
|
endif
|
|
if conf_data.get('HAVE_POLL').to_int() == 0
|
|
srcs_os += 'xserver_poll.c'
|
|
endif
|
|
|
|
if conf_data.get('BUSFAULT').to_int() != 0
|
|
srcs_os += 'busfault.c'
|
|
endif
|
|
|
|
if get_option('xdmcp')
|
|
srcs_os += 'xdmcp.c'
|
|
endif
|
|
|
|
rpc_dep = []
|
|
if get_option('secure-rpc')
|
|
# prefer libtirpc (if available), otherwise ensure RPC functions are
|
|
# provided by libc.
|
|
rpc_dep = dependency('libtirpc', required: false, include_type: 'system')
|
|
if not (rpc_dep.found() or cc.has_header('rpc/rpc.h'))
|
|
error('secure-rpc requested, but neither libtirpc or libc RPC support were found')
|
|
endif
|
|
# XXX: also check if RPC library provides xdr_opaque_auth, authdes_(sec)create ???
|
|
srcs_os += 'rpcauth.c'
|
|
endif
|
|
|
|
os_dep = []
|
|
os_c_args = []
|
|
if get_option('xres')
|
|
# Only the XRes extension cares about the client ID.
|
|
os_c_args += '-DCLIENTIDS'
|
|
if host_machine.system() == 'openbsd'
|
|
os_dep += cc.find_library('kvm')
|
|
endif
|
|
endif
|
|
|
|
libxlibc = []
|
|
if srcs_libc.length() > 0
|
|
libxlibc = static_library('libxlibc',
|
|
srcs_libc,
|
|
include_directories: inc,
|
|
dependencies: [
|
|
xproto_dep,
|
|
],
|
|
)
|
|
endif
|
|
|
|
if enable_input_thread
|
|
os_dep += cc.find_library('pthread')
|
|
endif
|
|
|
|
libxserver_os = static_library('libxserver_os',
|
|
srcs_os,
|
|
include_directories: inc,
|
|
dependencies: [
|
|
dtrace_dep,
|
|
common_dep,
|
|
dl_dep,
|
|
sha1_dep,
|
|
rpc_dep,
|
|
os_dep,
|
|
dependency('xau')
|
|
],
|
|
c_args: os_c_args,
|
|
link_with: libxlibc,
|
|
)
|