commit: 4d1a9415f7213980ee9615c4ad4051f44561100f Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Sat Jan 15 15:36:44 2022 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Sat Jan 15 15:41:32 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d1a9415
sys-apps/systemd: backport cross compile fix Bug: https://bugs.gentoo.org/831221 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> sys-apps/systemd/files/249.9-cross-compile.patch | 23 +++++++++++++++++++++++ sys-apps/systemd/systemd-249.9.ebuild | 1 + 2 files changed, 24 insertions(+) diff --git a/sys-apps/systemd/files/249.9-cross-compile.patch b/sys-apps/systemd/files/249.9-cross-compile.patch new file mode 100644 index 000000000000..e063d303c7d8 --- /dev/null +++ b/sys-apps/systemd/files/249.9-cross-compile.patch @@ -0,0 +1,23 @@ +From 3d7fd38ea938ab194366f40ed7aa413ad33f2fad Mon Sep 17 00:00:00 2001 +From: Yu Watanabe <watanabe.yu+git...@gmail.com> +Date: Tue, 21 Dec 2021 20:10:09 +0900 +Subject: [PATCH] meson: fix cross compiling + +(cherry picked from commit 3112d756a36993900b70fbff98e69a2a43b970a8) +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 02495d16c9..c76cab535d 100644 +--- a/meson.build ++++ b/meson.build +@@ -442,7 +442,7 @@ conf.set('SIZEOF_DEV_T', cc.sizeof('dev_t', prefix : '#include <sys/types.h>')) + conf.set('SIZEOF_INO_T', cc.sizeof('ino_t', prefix : '#include <sys/types.h>')) + conf.set('SIZEOF_TIME_T', cc.sizeof('time_t', prefix : '#include <sys/time.h>')) + conf.set('SIZEOF_RLIM_T', cc.sizeof('rlim_t', prefix : '#include <sys/resource.h>')) +-conf.set('SIZEOF_TIMEX_MEMBER', cc.sizeof('((struct timex *)0)->freq', prefix : '#include <sys/timex.h>')) ++conf.set('SIZEOF_TIMEX_MEMBER', cc.sizeof('typeof(((struct timex *)0)->freq)', prefix : '#include <sys/timex.h>')) + + decl_headers = ''' + #include <uchar.h> diff --git a/sys-apps/systemd/systemd-249.9.ebuild b/sys-apps/systemd/systemd-249.9.ebuild index f10dc8e0b344..33318710a8e7 100644 --- a/sys-apps/systemd/systemd-249.9.ebuild +++ b/sys-apps/systemd/systemd-249.9.ebuild @@ -232,6 +232,7 @@ src_prepare() { # Add local patches here PATCHES+=( + "${FILESDIR}/249.9-cross-compile.patch" ) if ! use vanilla; then
