From f0dd071e29918bcbf751009f1395a1be62327922 Mon Sep 17 00:00:00 2001
From: Thomas Trepl <thomas@linuxfromscratch.org>
Date: Wed, 8 Mar 2023 18:42:57 +0100
Subject: [PATCH] Add a patch to fix gcc-go version string

---
 general/prog/gcc.xml               | 23 +++++++++++++++--------
 introduction/welcome/changelog.xml |  9 +++++++++
 2 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/general/prog/gcc.xml b/general/prog/gcc.xml
index f69e3c8c2b..8b462f634c 100644
--- a/general/prog/gcc.xml
+++ b/general/prog/gcc.xml
@@ -115,17 +115,17 @@
         </para>
       </listitem>
     </itemizedlist>
-<!--
+
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
         <para>
-          Required patch for building against glibc-2.36:
-          <ulink url="&patch-root;/gcc-&gcc-version;-glibc_2.36-1.patch"/>
+          Optional patch when adding Go to the desired language list:
+          <ulink url="&patch-root;/gcc-&gcc-version;-fix_go_version-1.patch"/>
         </para>
       </listitem>
     </itemizedlist>
--->
+
     <bridgehead renderas="sect3">GCC Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
@@ -171,13 +171,20 @@
       bootstrap anyway, add <parameter>--disable-bootstrap</parameter> to the
       <command>./configure</command> options below.
     </para>
-<!--
+
     <para>
-      First fix a problem with glibc-2.36:
+      Some packages checks on the phrase <literal>gccgo</literal> in the output
+      of <command>go version</command> to see which kind of Go compiler is
+      installed (gcc-go or golang). The absence of <literal>gccgo</literal> in
+      that string makes them to assume the compiler is the golang which is wrong.
+      If Go isn't in the list of desired languages, this patch can be skipped
+      while it does not harm if applied anyway. Fix the Go part of gcc to show
+      a valid version string when calling <command>go version</command> by
+      applying a patch:
     </para>
 
-<screen><userinput>patch -Np1 -i ../gcc-&gcc-version;-glibc_2.36-1.patch</userinput></screen>
--->
+<screen><userinput>patch -Np1 -i ../gcc-&gcc-version;-fix_go_version-1.patch</userinput></screen>
+
     <para>
       Install <application>GCC</application> by running the following commands:
     </para>
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index d0ac0cb8f4..5b88ae05f8 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -38,6 +38,15 @@
       </itemizedlist>
     </listitem>
     -->
+    <listitem>
+      <para>March 7th, 2023</para>
+      <itemizedlist>
+        <listitem>
+          <para>[thomas] - Add a patch to fix gcc-go version string (part of gcc-12.2.0).</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>March 7th, 2023</para>
       <itemizedlist>