From db36a8f1e1218321b9c60c83138ea939808e73df Mon Sep 17 00:00:00 2001
From: Augustin Cavalier <waddlesplash@gmail.com>
Date: Fri, 24 May 2019 19:26:39 -0400
Subject: [PATCH] gcc: Add recipe for GCC 8.3 and enable by default.

---
 ..._07.recipe => gcc-8.3.0_2019_05_24.recipe} | 22 +++++++++----------
 ...patchset => gcc-8.3.0_2019_05_24.patchset} |  0
 2 files changed, 11 insertions(+), 11 deletions(-)
 rename sys-devel/gcc/{gcc8-8.1.0_2018_05_07.recipe => gcc-8.3.0_2019_05_24.recipe} (96%)
 rename sys-devel/gcc/patches/{gcc8-8.1.0_2018_05_07.patchset => gcc-8.3.0_2019_05_24.patchset} (100%)

diff --git a/sys-devel/gcc/gcc8-8.1.0_2018_05_07.recipe b/sys-devel/gcc/gcc-8.3.0_2019_05_24.recipe
similarity index 96%
rename from sys-devel/gcc/gcc8-8.1.0_2018_05_07.recipe
rename to sys-devel/gcc/gcc-8.3.0_2019_05_24.recipe
index d4c3a5c08..61321ab36 100644
--- a/sys-devel/gcc/gcc8-8.1.0_2018_05_07.recipe
+++ b/sys-devel/gcc/gcc-8.3.0_2019_05_24.recipe
@@ -2,19 +2,19 @@ SUMMARY="C/C++ compiler for target ${effectiveTargetMachineTriple}"
 DESCRIPTION="The standard compiler for non-legacy Haiku (i.e. for all \
 architectures other than x86_gcc2)."
 HOMEPAGE="https://gcc.gnu.org/"
-COPYRIGHT="1988-2018 Free Software Foundation, Inc."
+COPYRIGHT="1988-2019 Free Software Foundation, Inc."
 LICENSE="GNU GPL v3
 	GNU LGPL v3"
 REVISION="1"
 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"
-CHECKSUM_SHA256="1d1866f992626e61349a1ccd0b8d5253816222cdc13390dcfaa74b093aa2b153"
+CHECKSUM_SHA256="64baadfe6cc0f4947a84cb12d7f0dfaf45bb58b7e92461639596c21e02d97d2c"
 SOURCE_DIR="gcc-$gccVersion"
-PATCHES="gcc8-$portVersion.patchset"
+PATCHES="gcc-$portVersion.patchset"
 
-ARCHITECTURES="!x86_gcc2 ?x86 ?x86_64 ?arm ?ppc"
-SECONDARY_ARCHITECTURES="?x86"
+ARCHITECTURES="!x86_gcc2 ?x86 x86_64 ?arm ?ppc"
+SECONDARY_ARCHITECTURES="x86"
 
 libatomicSoVersion="1"
 libatomicLibVersion="1.2.0"
@@ -38,7 +38,7 @@ libstdcxxSoVersion="6"
 libstdcxxLibVersion="6.0.25"
 
 PROVIDES="
-	gcc8$secondaryArchSuffix = $portVersion compat >= 7
+	gcc$secondaryArchSuffix = $portVersion compat >= 7
 	cmd:c++$secondaryArchSuffix = $portVersion compat >= 7
 	cmd:cc$secondaryArchSuffix = $portVersion compat >= 7
 	cmd:cpp$secondaryArchSuffix = $portVersion compat >= 7
@@ -65,7 +65,7 @@ DESCRIPTION_fortran="This package is not of general interest - it \
 contains the set of gcc's C/C++-runtime libraries and headers that is \
 required by gfortran to build fortran source code."
 PROVIDES_fortran="
-	gcc8${secondaryArchSuffix}_fortran = $portVersion compat >= 7
+	gcc${secondaryArchSuffix}_fortran = $portVersion compat >= 7
 	cmd:gfortran$secondaryArchSuffix = $portVersion compat >= 7
 	cmd:f951$secondaryArchSuffix = $portVersion compat >= 7
 	devel:libgfortran$secondaryArchSuffix = $libgfortranLibVersion compat >= $libgfortranSoVersion
@@ -73,7 +73,7 @@ PROVIDES_fortran="
 	"
 REQUIRES_fortran="
 	haiku$secondaryArchSuffix
-	gcc8${secondaryArchSuffix}_syslibs == $portVersion base
+	gcc${secondaryArchSuffix}_syslibs == $portVersion base
 	"
 
 SUMMARY_syslibs="C/C++-runtime shared libraries, needed to execute C/C++ programs"
@@ -81,7 +81,7 @@ DESCRIPTION_syslibs="The C/C++-runtime libraries that are part of the gcc \
 distribution. This package contains the shared libraries for the runtime \
 loader, so it is required for executing most c/c++ programs."
 PROVIDES_syslibs="
-	gcc8${secondaryArchSuffix}_syslibs = $portVersion compat >= 7
+	gcc${secondaryArchSuffix}_syslibs = $portVersion compat >= 7
 	lib:libatomic$secondaryArchSuffix = $libatomicLibVersion compat >= $libatomicSoVersion
 	lib:libgcc_s$secondaryArchSuffix = $libgccLibVersion compat >= $libgccSoVersion
 	lib:libgfortran$secondaryArchSuffix = $libgfortranLibVersion compat >= $libgfortranSoVersion
@@ -101,7 +101,7 @@ DESCRIPTION_syslibs_devel="This package is not of general interest - it \
 contains the set of gcc's C/C++-runtime libraries and headers that is \
 required by Haiku's build system when building Haiku."
 PROVIDES_syslibs_devel="
-	gcc8${secondaryArchSuffix}_syslibs_devel = $portVersion compat >= 7
+	gcc${secondaryArchSuffix}_syslibs_devel = $portVersion compat >= 7
 	devel:libatomic$secondaryArchSuffix = $libatomicLibVersion compat >= $libatomicSoVersion
 	devel:libgcc_kernel$secondaryArchSuffix = $libgccLibVersion compat >= $libgccSoVersion
 	devel:libgcc$secondaryArchSuffix = $libgccLibVersion compat >= $libgccSoVersion
@@ -146,7 +146,7 @@ installDir="$prefix/$relativeInstallDir"
 objectsDir=$sourceDir/../${portVersionedName}-obj
 gccLibDir=lib/gcc/$effectiveTargetMachineTriple/$gccVersion
 
-defineDebugInfoPackage gcc8$secondaryArchSuffix \
+defineDebugInfoPackage gcc$secondaryArchSuffix \
 	"$gccLibDir"/cc1 \
 	"$gccLibDir"/cc1plus \
 	"$gccLibDir"/collect2 \
diff --git a/sys-devel/gcc/patches/gcc8-8.1.0_2018_05_07.patchset b/sys-devel/gcc/patches/gcc-8.3.0_2019_05_24.patchset
similarity index 100%
rename from sys-devel/gcc/patches/gcc8-8.1.0_2018_05_07.patchset
rename to sys-devel/gcc/patches/gcc-8.3.0_2019_05_24.patchset