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

Reply via email to