From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1521948-garchives=archives.gentoo.org@lists.gentoo.org>
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) server-digest SHA256)
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 5F73215806E
for <garchives@archives.gentoo.org>; Sat, 27 May 2023 08:41:32 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id A219CE0874;
Sat, 27 May 2023 08:41:31 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.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 885C3E0874
for <gentoo-commits@lists.gentoo.org>; Sat, 27 May 2023 08:41:31 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(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 BA72634081F
for <gentoo-commits@lists.gentoo.org>; Sat, 27 May 2023 08:41:30 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 1FC30A6C
for <gentoo-commits@lists.gentoo.org>; Sat, 27 May 2023 08:41:29 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org>
Message-ID: <1685176877.198f908bda13bb49d06565450ccd2ceacd53d74b.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-devel/clang-common/
X-VCS-Repository: repo/gentoo
X-VCS-Files: sys-devel/clang-common/clang-common-16.0.4-r1.ebuild sys-devel/clang-common/clang-common-16.0.4.ebuild
X-VCS-Directories: sys-devel/clang-common/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: 198f908bda13bb49d06565450ccd2ceacd53d74b
X-VCS-Branch: master
Date: Sat, 27 May 2023 08:41:29 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: c047a9b2-1ba9-443e-9da5-40680ef696fd
X-Archives-Hash: ddc3aea5e37b1aac5412a5b76f6d9d32
commit: 198f908bda13bb49d06565450ccd2ceacd53d74b
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat May 27 08:40:52 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat May 27 08:41:17 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=198f908b
sys-devel/clang-common: restore maybe-stddef changes to 16.0.4
Lost in bump (race when rebasing).
Fixes: 8f9dfc3b1e4f0b8bdda3951c675b5af922cf1b99
Signed-off-by: Sam James <sam <AT> gentoo.org>
...lang-common-16.0.4.ebuild => clang-common-16.0.4-r1.ebuild} | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/sys-devel/clang-common/clang-common-16.0.4.ebuild b/sys-devel/clang-common/clang-common-16.0.4-r1.ebuild
similarity index 93%
rename from sys-devel/clang-common/clang-common-16.0.4.ebuild
rename to sys-devel/clang-common/clang-common-16.0.4-r1.ebuild
index 4acd801b683d..358dca01c333 100644
--- a/sys-devel/clang-common/clang-common-16.0.4.ebuild
+++ b/sys-devel/clang-common/clang-common-16.0.4-r1.ebuild
@@ -87,6 +87,8 @@ src_install() {
@gentoo-runtimes.cfg
@gentoo-gcc-install.cfg
@gentoo-hardened.cfg
+ # bug #870001
+ -include "${EPREFIX}/usr/include/gentoo/maybe-stddefs.h"
EOF
# Baseline hardening (bug #851111)
@@ -101,6 +103,14 @@ src_install() {
dodir /usr/include/gentoo
+ cat >> "${ED}/usr/include/gentoo/maybe-stddefs.h" <<-EOF || die
+ /* __has_include is an extension, but it's fine, because this is only
+ for Clang anyway. */
+ #if defined __has_include && __has_include (<stdc-predef.h>) && !defined(__GLIBC__)
+ # include <stdc-predef.h>
+ #endif
+ EOF
+
local fortify_level=$(usex hardened 3 2)
# We have to do this because glibc's headers warn if F_S is set
# without optimization and that would at the very least be very noisy