From ec34587f1d97b7d1e0b0877882a1e13b4f69657a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 14 Jun 2024 13:37:33 -0700
Subject: [PATCH] gcc-multilib: update to 14.2.1+20250405.

---
 .../patches/fix-libiberty_pic.patch           |  2 +-
 srcpkgs/gcc-multilib/template                 | 62 +++++++++++--------
 2 files changed, 37 insertions(+), 27 deletions(-)

diff --git a/srcpkgs/gcc-multilib/patches/fix-libiberty_pic.patch b/srcpkgs/gcc-multilib/patches/fix-libiberty_pic.patch
index f43dd62f15d..ad7173e5caa 100644
--- a/srcpkgs/gcc-multilib/patches/fix-libiberty_pic.patch
+++ b/srcpkgs/gcc-multilib/patches/fix-libiberty_pic.patch
@@ -8,5 +8,5 @@
 -               $(HDEFINES) @ac_libiberty_warn_cflags@ -D_GNU_SOURCE \
 +COMPILE.c = $(CC) -c @DEFS@ $(CFLAGS) $(CPPFLAGS) -fPIC -I. -I$(INCDIR) \
 +               $(HDEFINES) @ac_libiberty_warn_cflags@ -D_DEFAULT_SOURCE \
-                @CET_HOST_FLAGS@
+                @CET_HOST_FLAGS@ @HWCAP_CFLAGS@
  
diff --git a/srcpkgs/gcc-multilib/template b/srcpkgs/gcc-multilib/template
index 6af5541e1db..55e6b9a7884 100644
--- a/srcpkgs/gcc-multilib/template
+++ b/srcpkgs/gcc-multilib/template
@@ -3,32 +3,41 @@ archs="x86_64"
 _triplet="x86_64-unknown-linux-gnu"
 
 pkgname=gcc-multilib
-version=13.2.0
+version=14.2.1+20250405
 revision=1
-_majorver="${version%.*}"
+_patchver="${version%+*}"
+_minorver="${version%.*}"
+_majorver="${_minorver%.*}"
+hostmakedepends="perl flex tar"
+makedepends="zlib-devel libzstd-devel isl-devel libmpc-devel gmp-devel mpfr-devel
+ glibc-32bit glibc-devel-32bit"
+depends="
+ gcc>=${_minorver}
+ libgcc-32bit>=${_minorver}
+ libgomp-devel-32bit>=${_minorver}
+ libitm-devel-32bit>=${_minorver}
+ libsanitizer-devel-32bit>=${_minorver}
+ libatomic-devel-32bit>=${_minorver}
+ libvtv-devel-32bit>=${_minorver}
+ zlib-32bit glibc-devel-32bit"
 short_desc="GNU Compiler Collection (multilib files)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 homepage="http://gcc.gnu.org"
 license="GFDL-1.2-or-later, GPL-3.0-or-later, LGPL-2.1-or-later"
-distfiles="${GNU_SITE}/gcc/gcc-${version}/gcc-${version}.tar.xz"
-checksum=e275e76442a6067341a27f04c5c6b83d8613144004c0413528863dc6b5c743da
+case "${version}" in
+	*+*) distfiles="https://gcc.gnu.org/pub/gcc/snapshots/${_majorver}-${version#*+}/gcc-${_majorver}-${version#*+}.tar.xz" ;;
+	*) distfiles="${GNU_SITE}/gcc/gcc-${version}.tar.xz" ;;
+esac
+checksum=9a84b0947d8fb18197eef3fce8e255e30a61f7f382cebb961b1705c1d99214a3
 
-hostmakedepends="perl flex tar zip unzip"
-makedepends="zlib-devel libmpc-devel isl-devel libfl-devel
- glibc-32bit glibc-devel-32bit"
-
-depends="
- gcc>=${_majorver}
- libgcc-32bit>=${_majorver}
- libgomp-devel-32bit>=${_majorver}
- libitm-devel-32bit>=${_majorver}
- libsanitizer-devel-32bit>=${_majorver}
- libatomic-devel-32bit>=${_majorver}
- libvtv-devel-32bit>=${_majorver}
- zlib-32bit
- glibc-devel-32bit"
 replaces="libmpx-devel-32bit>=0 libssp-32bit>=0 libssp-devel-32bit>=0"
 
+# Snapshot tarballs get removed after over a year, we can archive the ones we need in distfiles.
+case "$XBPS_DISTFILES_FALLBACK" in
+	*"repo-default.voidlinux.org/distfiles"*) ;;
+	*) XBPS_DISTFILES_FALLBACK+=" https://repo-default.voidlinux.org/distfiles" ;;
+esac
+
 do_configure() {
 	ldconfig &>/dev/null
 
@@ -69,6 +78,7 @@ do_configure() {
 do_build() {
 	make ${makejobs}
 }
+
 do_install() {
 	local _pc_triplet=x86_64-pc-linux-gnu
 	# Install to a tempdir and then only copy relevant files.
@@ -77,19 +87,19 @@ do_install() {
 
 	# Make version a symlink of major version to make all versions
 	# from the same series work automagically.
-	vmkdir usr/include/c++/${_majorver}/${_triplet}
-	vmkdir usr/lib/gcc/${_triplet}/${_majorver}
+	vmkdir usr/include/c++/${_minorver}/${_triplet}
+	vmkdir usr/lib/gcc/${_triplet}/${_minorver}
 
-	cp -a ${wrksrc}/${pkgname}-build/usr/lib/gcc/${_pc_triplet}/${version}/32 \
-		${DESTDIR}/usr/lib/gcc/${_triplet}/${_majorver}/
-	cp -a ${wrksrc}/${pkgname}-build/usr/include/c++/${version}/${_pc_triplet}/32 \
-		${DESTDIR}/usr/include/c++/${_majorver}/${_triplet}
+	cp -a ${wrksrc}/${pkgname}-build/usr/lib/gcc/${_pc_triplet}/${_patchver}/32 \
+		${DESTDIR}/usr/lib/gcc/${_triplet}/${_minorver}/
+	cp -a ${wrksrc}/${pkgname}-build/usr/include/c++/${_patchver}/${_pc_triplet}/32 \
+		${DESTDIR}/usr/include/c++/${_minorver}/${_triplet}
 
-	vinstall ${wrksrc}/host-${_pc_triplet}/gcc/specs 644 usr/lib/gcc/${_triplet}/${_majorver}
+	vinstall ${wrksrc}/host-${_pc_triplet}/gcc/specs 644 usr/lib/gcc/${_triplet}/${_minorver}
 }
 
 gcc-objc-multilib_package() {
-	depends="gcc-multilib>=${_majorver} gcc-objc>=${_majorver} libobjc-devel-32bit>=${_majorver}"
+	depends="gcc-multilib>=${_minorver} gcc-objc>=${_minorver} libobjc-devel-32bit>=${_minorver}"
 	short_desc="GNU Objective-C compiler (multilib files)"
 	build_style=meta
 }