From e22818221be399297b2038cce986895bdb984c2c Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sat, 1 Dec 2018 01:01:36 +0100 Subject: [PATCH] meson: Unify linux/stat.h check with other checks and use _GNU_SOURCE Fixes a build failure with glibc 2.28. --- ...her-struct-statx-is-defined-in-sys-s.patch | 105 ++++++++++++++++++ ...rmission-changes-for-dev-dri-renderD.patch | 6 +- ...daemon-for-inter-fsckd-communication.patch | 4 +- ...t.h-check-with-other-checks-and-use-.patch | 72 ++++++++++++ debian/patches/series | 2 + 5 files changed, 184 insertions(+), 5 deletions(-) create mode 100644 debian/patches/build-sys-Detect-whether-struct-statx-is-defined-in-sys-s.patch create mode 100644 debian/patches/meson-unify-linux-stat.h-check-with-other-checks-and-use-.patch diff --git a/debian/patches/build-sys-Detect-whether-struct-statx-is-defined-in-sys-s.patch b/debian/patches/build-sys-Detect-whether-struct-statx-is-defined-in-sys-s.patch new file mode 100644 index 000000000..8366d68b7 --- /dev/null +++ b/debian/patches/build-sys-Detect-whether-struct-statx-is-defined-in-sys-s.patch @@ -0,0 +1,105 @@ +From: Filipe Brandenburger +Date: Sun, 15 Jul 2018 22:43:35 -0700 +Subject: build-sys: Detect whether struct statx is defined in sys/stat.h +MIME-Version: 1.0 +Content-Type: text/plain; charset="utf-8" +Content-Transfer-Encoding: 8bit + +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 + +(cherry picked from commit 75720bff62a84896e9a0654afc7cf9408cf89a38) +--- + meson.build | 5 +++++ + src/basic/missing.h | 5 ++++- + src/basic/xattr-util.c | 1 - + 3 files changed, 9 insertions(+), 2 deletions(-) + +diff --git a/meson.build b/meson.build +index 1d864e3..58fe6e6 100644 +--- a/meson.build ++++ b/meson.build +@@ -424,6 +424,7 @@ decl_headers = ''' + #include + ''' + # 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', +@@ -438,6 +439,10 @@ foreach decl : ['char16_t', + conf.set10('HAVE_' + decl.underscorify().to_upper(), have) + endforeach + ++conf.set10('HAVE_STRUCT_STATX_IN_SYS_STAT_H', cc.sizeof('struct statx', prefix : ''' ++#include ++''', args : '-D_GNU_SOURCE') > 0) ++ + foreach decl : [['IFLA_INET6_ADDR_GEN_MODE', 'linux/if_link.h'], + ['IN6_ADDR_GEN_MODE_STABLE_PRIVACY', 'linux/if_link.h'], + ['IFLA_VRF_TABLE', 'linux/if_link.h'], +diff --git a/src/basic/missing.h b/src/basic/missing.h +index 71a07d0..14ad3d4 100644 +--- a/src/basic/missing.h ++++ b/src/basic/missing.h +@@ -15,7 +15,6 @@ + #include + #include + #include +-#include + #include + #include + #include +@@ -25,6 +24,10 @@ + #include + #include + ++#if !HAVE_STRUCT_STATX_IN_SYS_STAT_H ++#include ++#endif ++ + #if HAVE_AUDIT + #include + #endif +diff --git a/src/basic/xattr-util.c b/src/basic/xattr-util.c +index c5c55ea..0ee0979 100644 +--- a/src/basic/xattr-util.c ++++ b/src/basic/xattr-util.c +@@ -2,7 +2,6 @@ + + #include + #include +-#include + #include + #include + #include diff --git a/debian/patches/debian/Revert-udev-rules-Permission-changes-for-dev-dri-renderD.patch b/debian/patches/debian/Revert-udev-rules-Permission-changes-for-dev-dri-renderD.patch index 640d20b8f..188684ea8 100644 --- a/debian/patches/debian/Revert-udev-rules-Permission-changes-for-dev-dri-renderD.patch +++ b/debian/patches/debian/Revert-udev-rules-Permission-changes-for-dev-dri-renderD.patch @@ -15,10 +15,10 @@ This reverts commit 4e15a7343cb389e97f3eb4f49699161862d8b8b2. 4 files changed, 2 insertions(+), 9 deletions(-) diff --git a/meson.build b/meson.build -index 1d6144e..b16c9ca 100644 +index ed1de6c..4d3b92f 100644 --- a/meson.build +++ b/meson.build -@@ -743,7 +743,6 @@ conf.set10('ENABLE_WHEEL_GROUP', get_option('wheel-group')) +@@ -756,7 +756,6 @@ conf.set10('ENABLE_WHEEL_GROUP', get_option('wheel-group')) dev_kvm_mode = get_option('dev-kvm-mode') substs.set('DEV_KVM_MODE', dev_kvm_mode) conf.set10('DEV_KVM_UACCESS', dev_kvm_mode != '0666') @@ -26,7 +26,7 @@ index 1d6144e..b16c9ca 100644 kill_user_processes = get_option('default-kill-user-processes') conf.set10('KILL_USER_PROCESSES', kill_user_processes) -@@ -2884,7 +2883,6 @@ status = [ +@@ -2897,7 +2896,6 @@ status = [ 'minimum container UID base: @0@'.format(container_uid_base_min), 'maximum container UID base: @0@'.format(container_uid_base_max), '/dev/kvm access mode: @0@'.format(get_option('dev-kvm-mode')), diff --git a/debian/patches/debian/fsckd-daemon-for-inter-fsckd-communication.patch b/debian/patches/debian/fsckd-daemon-for-inter-fsckd-communication.patch index 9785eea30..7fd28108c 100644 --- a/debian/patches/debian/fsckd-daemon-for-inter-fsckd-communication.patch +++ b/debian/patches/debian/fsckd-daemon-for-inter-fsckd-communication.patch @@ -239,10 +239,10 @@ index 0000000..b7ad58d + + diff --git a/meson.build b/meson.build -index 1d864e3..1d6144e 100644 +index 0be3e2b..ed1de6c 100644 --- a/meson.build +++ b/meson.build -@@ -2182,6 +2182,14 @@ executable('systemd-makefs', +@@ -2195,6 +2195,14 @@ executable('systemd-makefs', install : true, install_dir : rootlibexecdir) diff --git a/debian/patches/meson-unify-linux-stat.h-check-with-other-checks-and-use-.patch b/debian/patches/meson-unify-linux-stat.h-check-with-other-checks-and-use-.patch new file mode 100644 index 000000000..b8cad42aa --- /dev/null +++ b/debian/patches/meson-unify-linux-stat.h-check-with-other-checks-and-use-.patch @@ -0,0 +1,72 @@ +From: =?utf-8?q?Zbigniew_J=C4=99drzejewski-Szmek?= +Date: Wed, 18 Jul 2018 17:26:17 +0200 +Subject: 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) +--- + meson.build | 20 ++++++++++++++------ + src/basic/missing.h | 2 +- + 2 files changed, 15 insertions(+), 7 deletions(-) + +diff --git a/meson.build b/meson.build +index 58fe6e6..0be3e2b 100644 +--- a/meson.build ++++ b/meson.build +@@ -420,11 +420,9 @@ decl_headers = ''' + #include + #include + #include +-#include + #include + ''' + # 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', +@@ -435,13 +433,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 ', ++ 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 +-''', 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 14ad3d4..9044683 100644 +--- a/src/basic/missing.h ++++ b/src/basic/missing.h +@@ -24,7 +24,7 @@ + #include + #include + +-#if !HAVE_STRUCT_STATX_IN_SYS_STAT_H ++#if WANT_LINUX_STAT_H + #include + #endif + diff --git a/debian/patches/series b/debian/patches/series index e9e4d0aef..71722203e 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -35,6 +35,8 @@ machined-when-reading-os-release-file-join-PID-namespace-.patch tree-wide-port-over-other-candidates-for-namespace_fork.patch pam_systemd-suppress-LOG_DEBUG-log-messages-if-debugging-.patch resolved-Increase-size-of-TCP-stub-replies.patch +build-sys-Detect-whether-struct-statx-is-defined-in-sys-s.patch +meson-unify-linux-stat.h-check-with-other-checks-and-use-.patch debian/Use-Debian-specific-config-files.patch debian/Bring-tmpfiles.d-tmp.conf-in-line-with-Debian-defaul.patch debian/Make-run-lock-tmpfs-an-API-fs.patch -- 2.39.5