diff options
| author | Filipe Brandenburger <filbranden@google.com> | 2018-07-16 07:43:35 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2018-07-16 11:14:29 +0200 |
| commit | 75720bff62a84896e9a0654afc7cf9408cf89a38 (patch) | |
| tree | 6c1db77b98b6aaf0b4a2d2f01b0d9993ba42a13a /src/basic/missing.h | |
| parent | login: use parse_uid() when unmounting user runtime directory (diff) | |
| download | systemd-75720bff62a84896e9a0654afc7cf9408cf89a38.tar.xz systemd-75720bff62a84896e9a0654afc7cf9408cf89a38.zip | |
build-sys: Detect whether struct statx is defined in sys/stat.h
Starting with glibc 2.27.9000-36.fc29, include file sys/stat.h will have a
definition for struct statx, in which case include file linux/stat.h should be
avoided, in order to prevent a duplicate definition.
In file included from ../src/basic/missing.h:18,
from ../src/basic/util.h:28,
from ../src/basic/hashmap.h:10,
from ../src/shared/bus-util.h:12,
from ../src/libsystemd/sd-bus/bus-creds.c:11:
/usr/include/linux/stat.h:99:8: error: redefinition of ‘struct statx’
struct statx {
^~~~~
In file included from /usr/include/sys/stat.h:446,
from ../src/basic/util.h:19,
from ../src/basic/hashmap.h:10,
from ../src/shared/bus-util.h:12,
from ../src/libsystemd/sd-bus/bus-creds.c:11:
/usr/include/bits/statx.h:36:8: note: originally defined here
struct statx
^~~~~
Extend our meson.build to look for struct statx when only sys/stat.h is
included and, in that case, do not include linux/stat.h anymore.
Tested that systemd builds correctly when using a glibc version that includes a
definition for struct statx.
glibc Fedora RPM update:
https://src.fedoraproject.org/rpms/glibc/c/28cb5d31fc1e5887912283c889689c47076278ae
glibc upstream commit:
https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=fd70af45528d59a00eb3190ef6706cb299488fcd
Diffstat (limited to 'src/basic/missing.h')
| -rw-r--r-- | src/basic/missing.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/basic/missing.h b/src/basic/missing.h index 71a07d0574..14ad3d4914 100644 --- a/src/basic/missing.h +++ b/src/basic/missing.h @@ -15,7 +15,6 @@ #include <linux/neighbour.h> #include <linux/oom.h> #include <linux/rtnetlink.h> -#include <linux/stat.h> #include <net/ethernet.h> #include <stdlib.h> #include <sys/resource.h> @@ -25,6 +24,10 @@ #include <uchar.h> #include <unistd.h> +#if !HAVE_STRUCT_STATX_IN_SYS_STAT_H +#include <linux/stat.h> +#endif + #if HAVE_AUDIT #include <libaudit.h> #endif |