shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-03-28 02:50:16 +03:00
Code

Merge pull request from keszybz/two-meson-fixmes

Browse Source 
Two meson fixmes
This commit is contained in:
Lennart Poettering 2018-07-18 20:32:28 +02:00 committed by GitHub
commit 3bdfea0820
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 11 deletions

22
meson.build

@ -421,28 +421,34 @@ decl_headers = '''
#include <uchar.h>
#include <linux/ethtool.h>
#include <linux/fib_rules.h>
#include <linux/stat.h>
#include <sys/stat.h>
'''
# FIXME: key_serial_t is only defined in keyutils.h, this is bound to fail
# FIXME: these should use -D_GNU_SOURCE, since that is defined at build time
foreach decl : ['char16_t',
'char32_t',
'key_serial_t',
'struct ethtool_link_settings',
'struct fib_rule_uid_range',
'struct statx',
]
# We get -1 if the size cannot be determined
have = cc.sizeof(decl, prefix : decl_headers) > 0
have = cc.sizeof(decl, prefix : decl_headers, args : '-D_GNU_SOURCE') > 0
if decl == 'struct statx'
if have
want_linux_stat_h = false
else
have = cc.sizeof(decl,
prefix : decl_headers + '#include <linux/stat.h>',
args : '-D_GNU_SOURCE') > 0
want_linux_stat_h = have
endif
endif
conf.set10('HAVE_' + decl.underscorify().to_upper(), have)
endforeach
conf.set10('HAVE_STRUCT_STATX_IN_SYS_STAT_H', cc.sizeof('struct statx', prefix : '''
#include <sys/stat.h>
''', args : '-D_GNU_SOURCE') > 0)
conf.set10('WANT_LINUX_STAT_H', want_linux_stat_h)
foreach decl : [['IFLA_INET6_ADDR_GEN_MODE', 'linux/if_link.h'],
['IN6_ADDR_GEN_MODE_STABLE_PRIVACY', 'linux/if_link.h'],

4
src/basic/missing.h

@ -24,7 +24,7 @@
#include <uchar.h>
#include <unistd.h>
#if !HAVE_STRUCT_STATX_IN_SYS_STAT_H
#if WANT_LINUX_STAT_H
#include <linux/stat.h>
#endif
@ -1183,9 +1183,7 @@ struct input_mask {
#define KEY_ALS_TOGGLE 0x230
#endif
#if ! HAVE_KEY_SERIAL_T
typedef int32_t key_serial_t;
#endif
#ifndef KEYCTL_JOIN_SESSION_KEYRING
#define KEYCTL_JOIN_SESSION_KEYRING 1