commit: e4dfb164264174461dd6ac8a826fb01b00e5dbf8 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Thu Mar 7 18:36:18 2024 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Thu Mar 7 18:36:18 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4dfb164
Revert "sys-devel/gcc: drop obsolete cross fixincludes patch for 13" This reverts commit 456eee6e374b50a4d9108a642ca29c5573ac5cb8. Restore the fixincludes revert. The situation has improved a bit though, because we now only run fixincludes when it's truly needed, so having this patch is less risky to begin with. Caveat emptor for trying to remove this in future: make sure to test clean builds without mingw already built, and with. Bug: https://bugs.gentoo.org/905118 Bug: https://bugs.gentoo.org/925204 Closes: https://bugs.gentoo.org/926059 Signed-off-by: Sam James <sam <AT> gentoo.org> .../gcc/files/gcc-13-fix-cross-fixincludes.patch | 19 +++++++++++++++++++ sys-devel/gcc/gcc-12.3.1_p20240223.ebuild | 1 + sys-devel/gcc/gcc-12.3.1_p20240301.ebuild | 1 + sys-devel/gcc/gcc-13.2.1_p20240113-r1.ebuild | 1 + sys-devel/gcc/gcc-13.2.1_p20240210.ebuild | 1 + sys-devel/gcc/gcc-13.2.1_p20240224.ebuild | 1 + sys-devel/gcc/gcc-13.2.1_p20240302.ebuild | 1 + sys-devel/gcc/gcc-14.0.1_pre20240225.ebuild | 1 + sys-devel/gcc/gcc-14.0.1_pre20240303-r1.ebuild | 1 + 9 files changed, 27 insertions(+) diff --git a/sys-devel/gcc/files/gcc-13-fix-cross-fixincludes.patch b/sys-devel/gcc/files/gcc-13-fix-cross-fixincludes.patch new file mode 100644 index 000000000000..e4abe01a0830 --- /dev/null +++ b/sys-devel/gcc/files/gcc-13-fix-cross-fixincludes.patch @@ -0,0 +1,19 @@ +Revert of https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=59e4c98173a79fcaa2c33253261409f38856c384 +for now to fix cross fixincludes builds. + +https://bugs.gentoo.org/905118 +--- a/gcc/Makefile.in ++++ b/gcc/Makefile.in +@@ -532,11 +532,7 @@ LINKER_PLUGIN_API_H = $(srcdir)/../include/plugin-api.h + # Default native SYSTEM_HEADER_DIR, to be overridden by targets. + NATIVE_SYSTEM_HEADER_DIR = @NATIVE_SYSTEM_HEADER_DIR@ + # Default cross SYSTEM_HEADER_DIR, to be overridden by targets. +-ifeq (@includedir@,$(prefix)/include) +- CROSS_SYSTEM_HEADER_DIR = @CROSS_SYSTEM_HEADER_DIR@ +-else +- CROSS_SYSTEM_HEADER_DIR = @includedir@ +-endif ++CROSS_SYSTEM_HEADER_DIR = @CROSS_SYSTEM_HEADER_DIR@ + + # autoconf sets SYSTEM_HEADER_DIR to one of the above. + # Purge it of unnecessary internal relative paths diff --git a/sys-devel/gcc/gcc-12.3.1_p20240223.ebuild b/sys-devel/gcc/gcc-12.3.1_p20240223.ebuild index 6a9137e1c84d..6a09eedbf172 100644 --- a/sys-devel/gcc/gcc-12.3.1_p20240223.ebuild +++ b/sys-devel/gcc/gcc-12.3.1_p20240223.ebuild @@ -60,5 +60,6 @@ src_prepare() { toolchain_src_prepare + eapply "${FILESDIR}"/${PN}-13-fix-cross-fixincludes.patch eapply_user } diff --git a/sys-devel/gcc/gcc-12.3.1_p20240301.ebuild b/sys-devel/gcc/gcc-12.3.1_p20240301.ebuild index 6a9137e1c84d..6a09eedbf172 100644 --- a/sys-devel/gcc/gcc-12.3.1_p20240301.ebuild +++ b/sys-devel/gcc/gcc-12.3.1_p20240301.ebuild @@ -60,5 +60,6 @@ src_prepare() { toolchain_src_prepare + eapply "${FILESDIR}"/${PN}-13-fix-cross-fixincludes.patch eapply_user } diff --git a/sys-devel/gcc/gcc-13.2.1_p20240113-r1.ebuild b/sys-devel/gcc/gcc-13.2.1_p20240113-r1.ebuild index 3404c76c9248..7b1015f0e7cd 100644 --- a/sys-devel/gcc/gcc-13.2.1_p20240113-r1.ebuild +++ b/sys-devel/gcc/gcc-13.2.1_p20240113-r1.ebuild @@ -60,5 +60,6 @@ src_prepare() { toolchain_src_prepare + eapply "${FILESDIR}"/${PN}-13-fix-cross-fixincludes.patch eapply_user } diff --git a/sys-devel/gcc/gcc-13.2.1_p20240210.ebuild b/sys-devel/gcc/gcc-13.2.1_p20240210.ebuild index 865959900de6..012b57185a8a 100644 --- a/sys-devel/gcc/gcc-13.2.1_p20240210.ebuild +++ b/sys-devel/gcc/gcc-13.2.1_p20240210.ebuild @@ -60,5 +60,6 @@ src_prepare() { toolchain_src_prepare + eapply "${FILESDIR}"/${PN}-13-fix-cross-fixincludes.patch eapply_user } diff --git a/sys-devel/gcc/gcc-13.2.1_p20240224.ebuild b/sys-devel/gcc/gcc-13.2.1_p20240224.ebuild index c4394cbaa0e9..dfdf0151adad 100644 --- a/sys-devel/gcc/gcc-13.2.1_p20240224.ebuild +++ b/sys-devel/gcc/gcc-13.2.1_p20240224.ebuild @@ -60,5 +60,6 @@ src_prepare() { toolchain_src_prepare + eapply "${FILESDIR}"/${PN}-13-fix-cross-fixincludes.patch eapply_user } diff --git a/sys-devel/gcc/gcc-13.2.1_p20240302.ebuild b/sys-devel/gcc/gcc-13.2.1_p20240302.ebuild index c4394cbaa0e9..dfdf0151adad 100644 --- a/sys-devel/gcc/gcc-13.2.1_p20240302.ebuild +++ b/sys-devel/gcc/gcc-13.2.1_p20240302.ebuild @@ -60,5 +60,6 @@ src_prepare() { toolchain_src_prepare + eapply "${FILESDIR}"/${PN}-13-fix-cross-fixincludes.patch eapply_user } diff --git a/sys-devel/gcc/gcc-14.0.1_pre20240225.ebuild b/sys-devel/gcc/gcc-14.0.1_pre20240225.ebuild index 07ffb3cbdbe1..4b44c53c818f 100644 --- a/sys-devel/gcc/gcc-14.0.1_pre20240225.ebuild +++ b/sys-devel/gcc/gcc-14.0.1_pre20240225.ebuild @@ -60,5 +60,6 @@ src_prepare() { toolchain_src_prepare + eapply "${FILESDIR}"/${PN}-13-fix-cross-fixincludes.patch eapply_user } diff --git a/sys-devel/gcc/gcc-14.0.1_pre20240303-r1.ebuild b/sys-devel/gcc/gcc-14.0.1_pre20240303-r1.ebuild index ddfe33a42323..d864e654f957 100644 --- a/sys-devel/gcc/gcc-14.0.1_pre20240303-r1.ebuild +++ b/sys-devel/gcc/gcc-14.0.1_pre20240303-r1.ebuild @@ -61,5 +61,6 @@ src_prepare() { toolchain_src_prepare eapply "${FILESDIR}"/${P}-uninit.patch + eapply "${FILESDIR}"/${PN}-13-fix-cross-fixincludes.patch eapply_user }
