Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-boot/tboot/
Date: Wed, 09 Feb 2022 11:25:16
Message-Id: 1644405816.5872ad7b37126df3e8897f3db41e3853e6840d99.sam@gentoo
1 commit: 5872ad7b37126df3e8897f3db41e3853e6840d99
2 Author: Christopher Byrne <salah.coronya <AT> gmail <DOT> com>
3 AuthorDate: Mon Feb 7 20:17:58 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Wed Feb 9 11:23:36 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5872ad7b
7
8 sys-boot/tboot: Die if tc-is-clang. Requires VLAIS which is gcc-only.
9
10 Closes: https://bugs.gentoo.org/832020
11 Package-Manager: Portage-3.0.30, Repoman-3.0.3
12 Signed-off-by: Christopher Byrne <salah.coronya <AT> gmail.com>
13 Closes: https://github.com/gentoo/gentoo/pull/24119
14 Signed-off-by: Sam James <sam <AT> gentoo.org>
15
16 sys-boot/tboot/tboot-1.10.3.ebuild | 12 +++++++++++-
17 1 file changed, 11 insertions(+), 1 deletion(-)
18
19 diff --git a/sys-boot/tboot/tboot-1.10.3.ebuild b/sys-boot/tboot/tboot-1.10.3.ebuild
20 index cdb682a949ff..4cedba3fabfc 100644
21 --- a/sys-boot/tboot/tboot-1.10.3.ebuild
22 +++ b/sys-boot/tboot/tboot-1.10.3.ebuild
23 @@ -1,4 +1,4 @@
24 -# Copyright 1999-2021 Gentoo Authors
25 +# Copyright 1999-2022 Gentoo Authors
26 # Distributed under the terms of the GNU General Public License v2
27
28 EAPI=8
29 @@ -28,6 +28,16 @@ PATCHES=( "${FILESDIR}/${PN}-1.10.3-disable-Werror.patch"
30 "${FILESDIR}/${PN}-1.10.3-disable-strip.patch"
31 "${FILESDIR}/${PN}-1.10.3-dont-call-toolchain-directly.patch" )
32
33 +pkg_setup() {
34 + if tc-is-clang; then
35 + eerror "tboot is a freestanding application that uses gcc"
36 + eerror "extensions in fundemental ways, include VLAIS"
37 + eerror "(Variable Length Arrays in Structs) and will not"
38 + eerror "compile with clang witout upstream action"
39 + die "Cannot compile with clang. See bug #832020"
40 + fi
41 +}
42 +
43 src_configure() {
44 tc-export AS LD CC CPP AR RANLIB NM OBJCOPY OBJDUMP STRIP