On Wed, Feb 13, 2019 at 10:24:03AM -0500, [email protected] wrote:
> From: Jon Ringle <[email protected]>
>
> Add upstream patch:
> https://github.com/systemd/systemd/commit/9c869d08d82c73f62ab3527567858ce4b0cf1257
>
> This fixes the following compilation problem when building with
> OSELAS.Toolchain-2018.12.0
Hmm, strange. I don't see this issue here. Do you have KERNEL_HEADER
enabled in your BSP and if yes which version?
Michael
> In file included from ../systemd-239/src/basic/util.h:28,
> from ../systemd-239/src/basic/fs-util.h:14,
> from
> ../systemd-239/src/libsystemd/sd-network/sd-network.c:13:
> ../systemd-239/src/basic/missing.h:1369:8: error: redefinition of 'struct
> statx_timestamp'
> struct statx_timestamp {
> ^~~~~~~~~~~~~~~
> In file included from
> /opt/OSELAS.Toolchain-2018.12.0/arm-v5te-linux-gnueabi/gcc-8.2.1-glibc-2.28-binutils-2.31.1-kernel-4.19-sanitized/sysroot-arm-v5te-linux-gnueabi/usr/include/sys/stat.h:446,
> from ../systemd-239/src/basic/util.h:19,
> from ../systemd-239/src/basic/fs-util.h:14,
> from
> ../systemd-239/src/libsystemd/sd-network/sd-network.c:13:
> /opt/OSELAS.Toolchain-2018.12.0/arm-v5te-linux-gnueabi/gcc-8.2.1-glibc-2.28-binutils-2.31.1-kernel-4.19-sanitized/sysroot-arm-v5te-linux-gnueabi/usr/include/bits/statx.h:25:8:
> note: originally defined here
> struct statx_timestamp
> ^~~~~~~~~~~~~~~
> In file included from ../systemd-239/src/basic/util.h:28,
> from ../systemd-239/src/basic/fs-util.h:14,
> from
> ../systemd-239/src/libsystemd/sd-network/sd-network.c:13:
> ../systemd-239/src/basic/missing.h:1374:8: error: redefinition of 'struct
> statx'
> struct statx {
> ^~~~~
> In file included from
> /opt/OSELAS.Toolchain-2018.12.0/arm-v5te-linux-gnueabi/gcc-8.2.1-glibc-2.28-binutils-2.31.1-kernel-4.19-sanitized/sysroot-arm-v5te-linux-gnueabi/usr/include/sys/stat.h:446,
> from ../systemd-239/src/basic/util.h:19,
> from ../systemd-239/src/basic/fs-util.h:14,
> from
> ../systemd-239/src/libsystemd/sd-network/sd-network.c:13:
> /opt/OSELAS.Toolchain-2018.12.0/arm-v5te-linux-gnueabi/gcc-8.2.1-glibc-2.28-binutils-2.31.1-kernel-4.19-sanitized/sysroot-arm-v5te-linux-gnueabi/usr/include/bits/statx.h:36:8:
> note: originally defined here
> struct statx
> ^~~~~
> [5/749] Compiling C object
> 'src/libsystemd/systemd_static@sta/sd-path_sd-path.c.o'.
> FAILED: src/libsystemd/systemd_static@sta/sd-path_sd-path.c.o
>
> Signed-off-by: Jon Ringle <[email protected]>
> ---
> ...-linux-stat.h-check-with-other-checks-and.patch | 70
> ++++++++++++++++++++++
> patches/systemd-239/series | 3 +-
> 2 files changed, 72 insertions(+), 1 deletion(-)
> create mode 100644
> patches/systemd-239/0003-meson-unify-linux-stat.h-check-with-other-checks-and.patch
>
> diff --git
> a/patches/systemd-239/0003-meson-unify-linux-stat.h-check-with-other-checks-and.patch
>
> b/patches/systemd-239/0003-meson-unify-linux-stat.h-check-with-other-checks-and.patch
> new file mode 100644
> index 0000000..fb6d6c0
> --- /dev/null
> +++
> b/patches/systemd-239/0003-meson-unify-linux-stat.h-check-with-other-checks-and.patch
> @@ -0,0 +1,70 @@
> +From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <[email protected]>
> +Date: Wed, 18 Jul 2018 17:26:17 +0200
> +Subject: [PATCH] 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.
> +---
> + meson.build | 20 ++++++++++++++------
> + src/basic/missing.h | 2 +-
> + 2 files changed, 15 insertions(+), 7 deletions(-)
> +
> +diff --git a/meson.build b/meson.build
> +index a0e724070874..5dcabdc6c29a 100644
> +--- a/meson.build
> ++++ b/meson.build
> +@@ -421,11 +421,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',
> +@@ -436,13 +434,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 14ad3d49140f..9044683b15fb 100644
> +--- a/src/basic/missing.h
> ++++ b/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
> +
> diff --git a/patches/systemd-239/series b/patches/systemd-239/series
> index bdfa3c1..7168678 100644
> --- a/patches/systemd-239/series
> +++ b/patches/systemd-239/series
> @@ -2,4 +2,5 @@
> #tag:base --start-number 1
> 0001-build-sys-Detect-whether-struct-statx-is-defined-in-.patch
> 0002-dhcp6-make-sure-we-have-enough-space-for-the-DHCP6-o.patch
> -# 69d3a3089d693a020a7338b3e119044a - git-ptx-patches magic
> +0003-meson-unify-linux-stat.h-check-with-other-checks-and.patch
> +# 61495c74b2cb09dfd1637f0f41644f1f - git-ptx-patches magic
> --
> 1.9.1
>
>
> _______________________________________________
> ptxdist mailing list
> [email protected]
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
ptxdist mailing list
[email protected]
