diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2018-07-18 17:26:17 +0200 |
|---|---|---|
| committer | Adrian Szyndela <adrian.s@samsung.com> | 2020-03-26 16:04:19 +0100 |
| commit | fcb8124c885cb87fb70d6776351939564212d628 (patch) | |
| tree | 713932bae1948ac249b75d1775e42ac0193a8a90 | |
| parent | 9fa0c44308b7b07292f0848c22e1e5b3ff37ee85 (diff) | |
| download | systemd-fcb8124c885cb87fb70d6776351939564212d628.tar.gz systemd-fcb8124c885cb87fb70d6776351939564212d628.tar.bz2 systemd-fcb8124c885cb87fb70d6776351939564212d628.zip | |
(backport) meson: unify linux/stat.h check with other checks and use _GNU_SOURCE
Using _GNU_SOURCE is better because that's how we include the headers in the
actual build, and some headers define different stuff when it is defined.
sys/stat.h for example defines 'struct statx' conditionally.
Change-Id: I7cb80dc4339aa05d1a5dbebf483168c7dcce84d9
| -rw-r--r-- | meson.build | 20 | ||||
| -rw-r--r-- | src/basic/missing.h | 2 |
2 files changed, 15 insertions, 7 deletions
diff --git a/meson.build b/meson.build index 4e9032f677..2e4eb6c23b 100644 --- a/meson.build +++ b/meson.build @@ -466,11 +466,9 @@ 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', @@ -481,13 +479,23 @@ foreach decl : ['char16_t', ] # 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'], diff --git a/src/basic/missing.h b/src/basic/missing.h index 687bb51b39..61caf6f14f 100644 --- a/src/basic/missing.h +++ b/src/basic/missing.h @@ -43,7 +43,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 |