From e6d1fe4c26a87b8635693111333be7c6f070e851 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Mon, 1 May 2023 14:49:37 +0200
Subject: [PATCH] Update gcc-static-compat to 13.1.1

---
 gcc/static-compat/PKGBUILD | 31 ++++++++++++++++++++++---------
 1 file changed, 22 insertions(+), 9 deletions(-)

diff --git a/gcc/static-compat/PKGBUILD b/gcc/static-compat/PKGBUILD
index 1b07dab1..029215e3 100644
--- a/gcc/static-compat/PKGBUILD
+++ b/gcc/static-compat/PKGBUILD
@@ -1,10 +1,9 @@
 # toolchain build order: linux-api-headers->glibc->binutils->gcc->glibc->binutils->gcc
 # NOTE: libtool requires rebuilt with each new gcc version
 
-pkgname=({gcc,gcc-libs,lib32-gcc-libs,gcc-fortran,gcc-ada}-static-compat)
-pkgver=12.2.0
+pkgname=({gcc,gcc-libs,lib32-gcc-libs,gcc-ada,gcc-fortran}-static-compat)
+pkgver=13.1.1
 _majorver=${pkgver%%.*}
-_islver=0.24
 pkgrel=1
 pkgdesc='The GNU Compiler Collection'
 arch=(x86_64)
@@ -33,9 +32,9 @@ checkdepends=(
 options=(!emptydirs !lto debug)
 _prefix=/usr/static-compat
 _libdir=usr/static-compat/lib/gcc/$CHOST/${pkgver%%+*}
-# _commit=2ee5e4300186a92ad73f1a1a64cb918dc76c8d67
-# source=(git://gcc.gnu.org/git/gcc.git#commit=$_commit
-source=(https://sourceware.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.xz{,.sig}
+_commit=9a167ee2f8b9a0859fbab6cfdc276cf1f272effe
+source=(git://gcc.gnu.org/git/gcc.git#commit=$_commit
+#source=(https://sourceware.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.xz{,.sig}
         c89 c99
         gcc-ada-repro.patch
 )
@@ -43,8 +42,9 @@ validpgpkeys=(F3691687D867B81B51CE07D9BBE43771487328A9  # bpiotrowski@archlinux.
               86CFFCA918CF3AF47147588051E8B148A9999C34  # evangelos@foutrelis.com
               13975A70E63C361C73AE69EF6EEB81F8981C74C7  # richard.guenther@gmail.com
               D3A93CAD751C2AF4F8C7AD516C35B99309B5FA62) # Jakub Jelinek <jakub@redhat.com>
-sha256sums=('e549cf9cf3594a00e27b6589d4322d70e0720cdd213f39beb4181e06926230ff'
-            'SKIP'
+#sha256sums=('e549cf9cf3594a00e27b6589d4322d70e0720cdd213f39beb4181e06926230ff'
+#            'SKIP'
+sha256sums=('SKIP'
             'de48736f6e4153f03d0a5d38ceb6c6fdb7f054e8f47ddd6af0a3dbf14f27b931'
             '2513c6d9984dd0a2058557bf00f06d8d5181734e41dcfe07be7ed86f2959622a'
             '1773f5137f08ac1f48f0f7297e324d5d868d55201c03068670ee4602babdef2f')
@@ -109,8 +109,21 @@ build() {
   CFLAGS=${CFLAGS/-Werror=format-security/}
   CXXFLAGS=${CXXFLAGS/-Werror=format-security/}
 
+  # Fix the check for limits.h and certain other checks by dropping the fortify flag from CPPFLAGS
+  # note: Otherwise libiberty/config.h lacks HAVE_LIMITS_H and the compilation runs into errors like:
+  #  /build/gcc-static-compat/src/gcc/libiberty/fibheap.c:38:25: error: ‘LONG_MIN’ undeclared (first use in this function)
+  #  38 | #define FIBHEAPKEY_MIN  LONG_MIN
+  #     |                         ^~~~~~~~
+  #  /build/gcc-static-compat/src/gcc/libiberty/fibheap.c:220:30: note: in expansion of macro ‘FIBHEAPKEY_MIN’
+  #  220 |   if (okey == key && okey != FIBHEAPKEY_MIN)
+  #      |                              ^~~~~~~~~~~~~~
+  #  /build/gcc-static-compat/src/gcc/libiberty/fibheap.c:36:1: note: ‘LONG_MIN’ is defined in header ‘<limits.h>’; did you forget to ‘#include <limits.h>’?
+  #   35 | #include "fibheap.h"
+  #  +++ |+#include <limits.h>
+  CPPFLAGS=${CPPFLAGS/-D_FORTIFY_SOURCE=2}
+
   "$srcdir/gcc/configure" \
-    --enable-languages=c,c++,ada,fortran,lto \
+    --enable-languages=ada,c,c++,fortran,lto \
     $_confflags
   make
 }