From ce76abd5b2a33fb841ce8d46be3311a1a7e93c3d Mon Sep 17 00:00:00 2001
From: davidkaroly <92124087+davidkaroly@users.noreply.github.com>
Date: Wed, 17 Nov 2021 12:19:44 +0100
Subject: [PATCH] gcc-8.3.0: fix headers after building boot libraries (#6411)

---
 sys-devel/gcc/gcc-8.3.0_2019_05_24.recipe | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/sys-devel/gcc/gcc-8.3.0_2019_05_24.recipe b/sys-devel/gcc/gcc-8.3.0_2019_05_24.recipe
index 35a656a18..de2a21beb 100644
--- a/sys-devel/gcc/gcc-8.3.0_2019_05_24.recipe
+++ b/sys-devel/gcc/gcc-8.3.0_2019_05_24.recipe
@@ -5,7 +5,7 @@ HOMEPAGE="https://gcc.gnu.org/"
 COPYRIGHT="1988-2019 Free Software Foundation, Inc."
 LICENSE="GNU GPL v3
 	GNU LGPL v3"
-REVISION="14"
+REVISION="15"
 gccVersion="${portVersion%%_*}"
 SOURCE_URI="https://ftpmirror.gnu.org/gcc/gcc-$gccVersion/gcc-$gccVersion.tar.xz
 	https://ftp.gnu.org/gnu/gcc/gcc-$gccVersion/gcc-$gccVersion.tar.xz"
@@ -296,7 +296,6 @@ BUILD()
 		"../include/$effectiveTargetMachineTriple/bits/c++config.h" \
 		saved/
 	make clean
-	# deactivate threads and tls support
 	cp "../include/$effectiveTargetMachineTriple/bits/gthr-single.h" \
 		"../include/$effectiveTargetMachineTriple/bits/gthr-default.h"
 	sed -i -e 's,#define _GLIBCXX_HAS_GTHREADS 1,/* #undef _GLIBCXX_HAS_GTHREADS */,' \
@@ -305,7 +304,10 @@ BUILD()
 		"../include/$effectiveTargetMachineTriple/bits/c++config.h"
 	make $jobArgs CFLAGS="-O2 $bootCcFlags" CXXFLAGS="-O2 $bootCcFlags"
 	mv .libs/libsupc++.a .libs/libsupc++-boot.a
-	mv saved/* .libs/
+	mv saved/libsupc++* .libs/
+	mv saved/gthr-default.h "../include/$effectiveTargetMachineTriple/bits/"
+	mv saved/config.h ..
+	mv saved/c++config.h "../include/$effectiveTargetMachineTriple/bits/"
 	rmdir saved
 }