diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2018-07-18 17:26:17 +0200 |
|---|---|---|
| committer | Sven Eden <sven.eden@prydeworx.com> | 2018-10-29 10:18:21 +0100 |
| commit | 48a664bf275a9d5c411a26b2d781470245647fc0 (patch) | |
| tree | 233d325ec9a5fc286510e46b660f2c36066b55c6 | |
| parent | e644f2ca294b161b65b95d924aa35d2ffcb28abe (diff) | |
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.
(cherry picked from commit 9c869d08d82c73f62ab3527567858ce4b0cf1257)
| -rw-r--r-- | meson.build | 20 | ||||
| -rw-r--r-- | src/basic/missing.h | 1 |
2 files changed, 15 insertions, 6 deletions
diff --git a/meson.build b/meson.build index f1975db8b..c73b29e88 100644 --- a/meson.build +++ b/meson.build @@ -496,11 +496,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', @@ -511,13 +509,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 eddbb275e..7b267a212 100644 --- a/src/basic/missing.h +++ b/src/basic/missing.h @@ -28,6 +28,7 @@ /// Additional includes needed by elogind #include "musl_missing.h" #if !HAVE_STRUCT_STATX_IN_SYS_STAT_H +#if WANT_LINUX_STAT_H #endif #if HAVE_AUDIT |