From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1519080-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 5135415806E
	for <garchives@archives.gentoo.org>; Tue, 16 May 2023 23:18:13 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 56885E0845;
	Tue, 16 May 2023 23:18:12 +0000 (UTC)
Received: from smtp.gentoo.org (mail.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 353D3E0845
	for <gentoo-commits@lists.gentoo.org>; Tue, 16 May 2023 23:18:12 +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))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 2B4C03408DD
	for <gentoo-commits@lists.gentoo.org>; Tue, 16 May 2023 23:18:11 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id AA102A34
	for <gentoo-commits@lists.gentoo.org>; Tue, 16 May 2023 23:18:09 +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: <1684279049.3d3dbcb7be81dae3816aff400f7461beba4ddb22.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.3-r1.ebuild sys-devel/clang-common/clang-common-16.0.4.9999.ebuild sys-devel/clang-common/clang-common-17.0.0.9999.ebuild sys-devel/clang-common/clang-common-17.0.0_pre20230502.ebuild sys-devel/clang-common/clang-common-17.0.0_pre20230512.ebuild
X-VCS-Directories: sys-devel/clang-common/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: 3d3dbcb7be81dae3816aff400f7461beba4ddb22
X-VCS-Branch: master
Date: Tue, 16 May 2023 23:18:09 +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: 28ad54bf-4612-4680-9854-87e0b8544d9a
X-Archives-Hash: 91517dd208a462a6759b197aebc24ef8

commit:     3d3dbcb7be81dae3816aff400f7461beba4ddb22
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue May 16 23:17:29 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue May 16 23:17:29 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d3dbcb7

sys-devel/clang-common: add __GLIBC__ guard to maybe-stddefs.h too

It should be fine without this, but we know glibc has a safeguard to make
sure it's included, so let's not interfere there.

Bug: https://bugs.gentoo.org/870001
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-devel/clang-common/clang-common-16.0.3-r1.ebuild          | 2 +-
 sys-devel/clang-common/clang-common-16.0.4.9999.ebuild        | 2 +-
 sys-devel/clang-common/clang-common-17.0.0.9999.ebuild        | 2 +-
 sys-devel/clang-common/clang-common-17.0.0_pre20230502.ebuild | 2 +-
 sys-devel/clang-common/clang-common-17.0.0_pre20230512.ebuild | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/sys-devel/clang-common/clang-common-16.0.3-r1.ebuild b/sys-devel/clang-common/clang-common-16.0.3-r1.ebuild
index 0d894d8b4232..358dca01c333 100644
--- a/sys-devel/clang-common/clang-common-16.0.3-r1.ebuild
+++ b/sys-devel/clang-common/clang-common-16.0.3-r1.ebuild
@@ -106,7 +106,7 @@ src_install() {
 	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>)
+	#if defined __has_include && __has_include (<stdc-predef.h>) && !defined(__GLIBC__)
 	# include <stdc-predef.h>
 	#endif
 	EOF

diff --git a/sys-devel/clang-common/clang-common-16.0.4.9999.ebuild b/sys-devel/clang-common/clang-common-16.0.4.9999.ebuild
index ffae670e7202..51e0f70c6470 100644
--- a/sys-devel/clang-common/clang-common-16.0.4.9999.ebuild
+++ b/sys-devel/clang-common/clang-common-16.0.4.9999.ebuild
@@ -106,7 +106,7 @@ src_install() {
 	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>)
+	#if defined __has_include && __has_include (<stdc-predef.h>) && !defined(__GLIBC__)
 	# include <stdc-predef.h>
 	#endif
 	EOF

diff --git a/sys-devel/clang-common/clang-common-17.0.0.9999.ebuild b/sys-devel/clang-common/clang-common-17.0.0.9999.ebuild
index ffae670e7202..51e0f70c6470 100644
--- a/sys-devel/clang-common/clang-common-17.0.0.9999.ebuild
+++ b/sys-devel/clang-common/clang-common-17.0.0.9999.ebuild
@@ -106,7 +106,7 @@ src_install() {
 	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>)
+	#if defined __has_include && __has_include (<stdc-predef.h>) && !defined(__GLIBC__)
 	# include <stdc-predef.h>
 	#endif
 	EOF

diff --git a/sys-devel/clang-common/clang-common-17.0.0_pre20230502.ebuild b/sys-devel/clang-common/clang-common-17.0.0_pre20230502.ebuild
index ffae670e7202..51e0f70c6470 100644
--- a/sys-devel/clang-common/clang-common-17.0.0_pre20230502.ebuild
+++ b/sys-devel/clang-common/clang-common-17.0.0_pre20230502.ebuild
@@ -106,7 +106,7 @@ src_install() {
 	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>)
+	#if defined __has_include && __has_include (<stdc-predef.h>) && !defined(__GLIBC__)
 	# include <stdc-predef.h>
 	#endif
 	EOF

diff --git a/sys-devel/clang-common/clang-common-17.0.0_pre20230512.ebuild b/sys-devel/clang-common/clang-common-17.0.0_pre20230512.ebuild
index ffae670e7202..51e0f70c6470 100644
--- a/sys-devel/clang-common/clang-common-17.0.0_pre20230512.ebuild
+++ b/sys-devel/clang-common/clang-common-17.0.0_pre20230512.ebuild
@@ -106,7 +106,7 @@ src_install() {
 	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>)
+	#if defined __has_include && __has_include (<stdc-predef.h>) && !defined(__GLIBC__)
 	# include <stdc-predef.h>
 	#endif
 	EOF