From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1478669-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))
	(No client certificate requested)
	by finch.gentoo.org (Postfix) with ESMTPS id 8BAD215800F
	for <garchives@archives.gentoo.org>; Thu, 19 Jan 2023 21:03:32 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id A9A2BE08AD;
	Thu, 19 Jan 2023 21:03:30 +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 907DBE08AD
	for <gentoo-commits@lists.gentoo.org>; Thu, 19 Jan 2023 21:03:30 +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 9F2023408F9
	for <gentoo-commits@lists.gentoo.org>; Thu, 19 Jan 2023 21:03:29 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id D21FF807
	for <gentoo-commits@lists.gentoo.org>; Thu, 19 Jan 2023 21:03:26 +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: <1674162147.6c47136646d941a54a8e5b65df7e6a1b716c4a24.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-15.0.6-r1.ebuild sys-devel/clang-common/clang-common-15.0.7-r1.ebuild sys-devel/clang-common/clang-common-15.0.7.ebuild sys-devel/clang-common/clang-common-16.0.0.9999.ebuild sys-devel/clang-common/clang-common-16.0.0_pre20230101-r1.ebuild sys-devel/clang-common/clang-common-16.0.0_pre20230107-r1.ebuild sys-devel/clang-common/clang-common-16.0.0_pre20230107.ebuild
X-VCS-Directories: sys-devel/clang-common/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: 6c47136646d941a54a8e5b65df7e6a1b716c4a24
X-VCS-Branch: master
Date: Thu, 19 Jan 2023 21:03:26 +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: 24c69c38-4136-485a-a2e5-198275300c4a
X-Archives-Hash: 3714e8932b81dc50dc26790e44106f70

commit:     6c47136646d941a54a8e5b65df7e6a1b716c4a24
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 19 21:02:27 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jan 19 21:02:27 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c471366

sys-devel/clang-common: fix path to fortify.h for cross-compilation

ESYSROOT is definitely wrong here because this is used on the final
system. There's no guarantee ESYSROOT even exists then.

I'd realised a few days ago and forgot to come back to this. Thanks
to tt_1 for reminding.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-devel/clang-common/clang-common-15.0.6-r1.ebuild                    | 2 +-
 .../{clang-common-15.0.7.ebuild => clang-common-15.0.7-r1.ebuild}       | 2 +-
 sys-devel/clang-common/clang-common-16.0.0.9999.ebuild                  | 2 +-
 sys-devel/clang-common/clang-common-16.0.0_pre20230101-r1.ebuild        | 2 +-
 ...0.0_pre20230107.ebuild => clang-common-16.0.0_pre20230107-r1.ebuild} | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/sys-devel/clang-common/clang-common-15.0.6-r1.ebuild b/sys-devel/clang-common/clang-common-15.0.6-r1.ebuild
index 047c2afbd37e..4c031af64c3b 100644
--- a/sys-devel/clang-common/clang-common-15.0.6-r1.ebuild
+++ b/sys-devel/clang-common/clang-common-15.0.6-r1.ebuild
@@ -96,7 +96,7 @@ src_install() {
 		-fstack-clash-protection
 		-fstack-protector-strong
 		-fPIE
-		-include "${ESYSROOT}/usr/include/gentoo/fortify.h"
+		-include "${EPREFIX}/usr/include/gentoo/fortify.h"
 	EOF
 
 	dodir /usr/include/gentoo

diff --git a/sys-devel/clang-common/clang-common-15.0.7.ebuild b/sys-devel/clang-common/clang-common-15.0.7-r1.ebuild
similarity index 98%
rename from sys-devel/clang-common/clang-common-15.0.7.ebuild
rename to sys-devel/clang-common/clang-common-15.0.7-r1.ebuild
index 047c2afbd37e..4c031af64c3b 100644
--- a/sys-devel/clang-common/clang-common-15.0.7.ebuild
+++ b/sys-devel/clang-common/clang-common-15.0.7-r1.ebuild
@@ -96,7 +96,7 @@ src_install() {
 		-fstack-clash-protection
 		-fstack-protector-strong
 		-fPIE
-		-include "${ESYSROOT}/usr/include/gentoo/fortify.h"
+		-include "${EPREFIX}/usr/include/gentoo/fortify.h"
 	EOF
 
 	dodir /usr/include/gentoo

diff --git a/sys-devel/clang-common/clang-common-16.0.0.9999.ebuild b/sys-devel/clang-common/clang-common-16.0.0.9999.ebuild
index 2fdd5cbe6a13..be17e87b775a 100644
--- a/sys-devel/clang-common/clang-common-16.0.0.9999.ebuild
+++ b/sys-devel/clang-common/clang-common-16.0.0.9999.ebuild
@@ -96,7 +96,7 @@ src_install() {
 		-fstack-clash-protection
 		-fstack-protector-strong
 		-fPIE
-		-include "${ESYSROOT}/usr/include/gentoo/fortify.h"
+		-include "${EPREFIX}/usr/include/gentoo/fortify.h"
 	EOF
 
 	dodir /usr/include/gentoo

diff --git a/sys-devel/clang-common/clang-common-16.0.0_pre20230101-r1.ebuild b/sys-devel/clang-common/clang-common-16.0.0_pre20230101-r1.ebuild
index 842dddf858fd..eb35afdbc695 100644
--- a/sys-devel/clang-common/clang-common-16.0.0_pre20230101-r1.ebuild
+++ b/sys-devel/clang-common/clang-common-16.0.0_pre20230101-r1.ebuild
@@ -94,7 +94,7 @@ src_install() {
 		-fstack-clash-protection
 		-fstack-protector-strong
 		-fPIE
-		-include "${ESYSROOT}/usr/include/gentoo/fortify.h"
+		-include "${EPREFIX}/usr/include/gentoo/fortify.h"
 	EOF
 
 	dodir /usr/include/gentoo

diff --git a/sys-devel/clang-common/clang-common-16.0.0_pre20230107.ebuild b/sys-devel/clang-common/clang-common-16.0.0_pre20230107-r1.ebuild
similarity index 98%
rename from sys-devel/clang-common/clang-common-16.0.0_pre20230107.ebuild
rename to sys-devel/clang-common/clang-common-16.0.0_pre20230107-r1.ebuild
index 6f1eacac9cc2..3c407f5a1af6 100644
--- a/sys-devel/clang-common/clang-common-16.0.0_pre20230107.ebuild
+++ b/sys-devel/clang-common/clang-common-16.0.0_pre20230107-r1.ebuild
@@ -96,7 +96,7 @@ src_install() {
 		-fstack-clash-protection
 		-fstack-protector-strong
 		-fPIE
-		-include "${ESYSROOT}/usr/include/gentoo/fortify.h"
+		-include "${EPREFIX}/usr/include/gentoo/fortify.h"
 	EOF
 
 	dodir /usr/include/gentoo