From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id BDB65158087 for ; Sat, 15 Jan 2022 16:12:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DB9882BC00C; Sat, 15 Jan 2022 16:12:53 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 384452BC00C for ; Sat, 15 Jan 2022 16:12:53 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8741A34351C for ; Sat, 15 Jan 2022 16:12:51 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B9EB9295 for ; Sat, 15 Jan 2022 16:12:49 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1642263130.093f87aee2396c87ddecadbaa7027730f32f4516.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-boot/systemd-boot/, sys-boot/systemd-boot/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-boot/systemd-boot/files/249.9-cross-compile.patch sys-boot/systemd-boot/systemd-boot-249.9.ebuild X-VCS-Directories: sys-boot/systemd-boot/files/ sys-boot/systemd-boot/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: 093f87aee2396c87ddecadbaa7027730f32f4516 X-VCS-Branch: master Date: Sat, 15 Jan 2022 16:12:49 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 00ccd539-8624-40c4-8808-64f6e04e8260 X-Archives-Hash: a7107278014db405d62fbc2e917ceef7 commit: 093f87aee2396c87ddecadbaa7027730f32f4516 Author: Mike Gilbert gentoo org> AuthorDate: Sat Jan 15 16:12:10 2022 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Sat Jan 15 16:12:10 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=093f87ae sys-boot/systemd-boot: backport cross compile fix Bug: https://bugs.gentoo.org/831221 Signed-off-by: Mike Gilbert gentoo.org> .../systemd-boot/files/249.9-cross-compile.patch | 23 ++++++++++++++++++++++ sys-boot/systemd-boot/systemd-boot-249.9.ebuild | 1 + 2 files changed, 24 insertions(+) diff --git a/sys-boot/systemd-boot/files/249.9-cross-compile.patch b/sys-boot/systemd-boot/files/249.9-cross-compile.patch new file mode 100644 index 000000000000..e063d303c7d8 --- /dev/null +++ b/sys-boot/systemd-boot/files/249.9-cross-compile.patch @@ -0,0 +1,23 @@ +From 3d7fd38ea938ab194366f40ed7aa413ad33f2fad Mon Sep 17 00:00:00 2001 +From: Yu Watanabe +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 ')) + conf.set('SIZEOF_INO_T', cc.sizeof('ino_t', prefix : '#include ')) + conf.set('SIZEOF_TIME_T', cc.sizeof('time_t', prefix : '#include ')) + conf.set('SIZEOF_RLIM_T', cc.sizeof('rlim_t', prefix : '#include ')) +-conf.set('SIZEOF_TIMEX_MEMBER', cc.sizeof('((struct timex *)0)->freq', prefix : '#include ')) ++conf.set('SIZEOF_TIMEX_MEMBER', cc.sizeof('typeof(((struct timex *)0)->freq)', prefix : '#include ')) + + decl_headers = ''' + #include diff --git a/sys-boot/systemd-boot/systemd-boot-249.9.ebuild b/sys-boot/systemd-boot/systemd-boot-249.9.ebuild index 143c5280b8d8..c0a51a5c2eee 100644 --- a/sys-boot/systemd-boot/systemd-boot-249.9.ebuild +++ b/sys-boot/systemd-boot/systemd-boot-249.9.ebuild @@ -54,6 +54,7 @@ QA_EXECSTACK="usr/lib/systemd/boot/efi/*" PATCHES=( "${FILESDIR}/249-libshared-static.patch" + "${FILESDIR}/249.9-cross-compile.patch" ) src_configure() {