frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

meson: Use system method for locating tirpc 

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>
This commit is contained in:
Jeremy Huddleston Sequoia 2022-06-22 23:43:01 -07:00
parent aa636b97c6
commit 191e79afea
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
os/meson.build
View File

@ -58,7 +58,7 @@ 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)
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