diff options
| author | Lyude Paul <lyude@redhat.com> | 2018-06-22 12:49:47 -0400 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2018-07-03 17:13:38 -0400 |
| commit | d95a1310ef8e08a93a28f9766d1b4093f7891404 (patch) | |
| tree | c5809333b6db7082000183c6c510b1672fe22493 | |
| parent | d83efc47b7a524b4f8d4a993c27a3e402a98fa7c (diff) | |
meson: ensure the libc has RPC functions when secure-rpc is enabled
Currently our meson.build just makes the assumption that the libc is
going to provide RPC functions. This doesn't actually seem to be the
case on Fedora, which causes compilation to fail unexpectedly:
../../Projects/xserver/os/rpcauth.c:47:10: fatal error: rpc/rpc.h: No such file or directory
#include <rpc/rpc.h>
^~~~~~~~~~~
compilation terminated.
So, in the event that we can't use libtirpc ensure that we actually
check whether or not the libc provides rpc/rpc.h. If it doesn't, raise
an error.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Lyude Paul <lyude@redhat.com>
| -rw-r--r-- | os/meson.build | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/os/meson.build b/os/meson.build index eb8fcf55d..0e41f9c02 100644 --- a/os/meson.build +++ b/os/meson.build @@ -56,9 +56,13 @@ endif rpc_dep = [] if get_option('secure-rpc') - # prefer libtirpc (if available), otherwise assume RPC functions are + # prefer libtirpc (if available), otherwise ensure RPC functions are # provided by libc. rpc_dep = dependency('libtirpc', required: false) + 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 + srcs_os += 'rpcauth.c' endif |