From: Stuart Henderson <stu@spacehopper.org>
Subject: gcc adastrap archs
To: Pascal Stumpf <pascal@stumpf.co>
Cc: ports <ports@openbsd.org>
Date: Fri, 8 Aug 2025 10:17:12 +0100

currently the gcc ports download adastrap distfiles for archs which
don't build ada; can we remove them? not only would it mean shorter
downloads for people building from ports, it also makes it more
obvious which archs actually need bootstraps to be updated when
there are changes in base. (I was confused by those which still
list bootstrap files but have been removed from ONLY_FOR_ARCHS-ada).

(seeing how complicated the build is, I suppose it would be impractical
to move the ada parts to separate ports? that would be a nice thing in
general because it would decouple the bootstrap for a relatively
uncommon language from the main languages which are still quite
important in the ports tree - especially fortran).

Index: 11/Makefile
===================================================================
RCS file: /cvs/ports/lang/gcc/11/Makefile,v
diff -u -p -r1.45 Makefile
--- 11/Makefile	23 Jul 2025 18:51:31 -0000	1.45
+++ 11/Makefile	8 Aug 2025 09:13:56 -0000
@@ -21,12 +21,9 @@ FULL_PKGVERSION = $V
 REVISION = 18
 
 ADASTRAP-amd64 = adastrap-amd64-$V-5.tar.xz
-ADASTRAP-arm = adastrap-arm-4.9.4-0.tar.xz
-ADASTRAP-hppa = adastrap-hppa-8.3.0-1.tar.xz
 ADASTRAP-i386 = adastrap-i386-$V-3.tar.xz
 ADASTRAP-mips64 = adastrap-mips64-8.4.0-4.tar.xz
 ADASTRAP-powerpc = adastrap-powerpc-$V-3.tar.xz
-ADASTRAP-sparc64 = adastrap-sparc64-6.5.0-0.tar.xz
 
 PKGNAME-main =  gcc-${FULL_PKGVERSION}
 PKGNAME-libs =	gcc-libs-${FULL_PKGVERSION}
@@ -61,9 +58,9 @@ MAINTAINER =	Pascal Stumpf <pascal@stump
 
 DISTNAME =	gcc-${FULL_VERSION}
 DISTFILES =	${DISTNAME}.tar.xz
-SUPDISTFILES.strap =	${ADASTRAP-amd64} ${ADASTRAP-arm} ${ADASTRAP-hppa} \
-		${ADASTRAP-i386} ${ADASTRAP-mips64} ${ADASTRAP-powerpc} \
-		${ADASTRAP-sparc64}
+.for _arch in ${ONLY_FOR_ARCHS-ada}
+SUPDISTFILES.strap += ${ADASTRAP-${_arch}}
+.endfor
 EXTRACT_ONLY =	${DISTFILES}
 
 BUILD_DEPENDS +=	devel/bison
Index: 11/distinfo
===================================================================
RCS file: /cvs/ports/lang/gcc/11/distinfo,v
diff -u -p -r1.11 distinfo
--- 11/distinfo	23 Jul 2025 18:51:31 -0000	1.11
+++ 11/distinfo	8 Aug 2025 09:13:56 -0000
@@ -1,16 +1,10 @@
 SHA256 (gcc/adastrap-amd64-11.2.0-5.tar.xz) = xv2mjPXOBPnrbP98RlbKmbNgE3iP8MHBrShaipe/YNI=
-SHA256 (gcc/adastrap-arm-4.9.4-0.tar.xz) = sadBk8tP/65RDDIHlWE1yo9MnSUP/44Ou9064RXonto=
-SHA256 (gcc/adastrap-hppa-8.3.0-1.tar.xz) = 4aNP/H4TDLZnQ6ul0LAvYBTB+VAGZ77X9+XrEPqVxqs=
 SHA256 (gcc/adastrap-i386-11.2.0-3.tar.xz) = ZDdI+l19A0nvLsCt6Top0LFv3qayT7KbA+qwgiEwdjY=
 SHA256 (gcc/adastrap-mips64-8.4.0-4.tar.xz) = d69EYvO8/89BqS5LYgjpCLAtXf1ljKxBvqQmDqjoaew=
 SHA256 (gcc/adastrap-powerpc-11.2.0-3.tar.xz) = acJtrhP/QyqtfDHrcXZjwI1LIBBN8C+SrTokVunndSQ=
-SHA256 (gcc/adastrap-sparc64-6.5.0-0.tar.xz) = cqpGS2beYV+CFf7X+P4voVHHT78v6SCgtksHXjP/B4E=
 SHA256 (gcc/gcc-11.2.0.tar.xz) = 0I7cU2tUw3KhAQ/2YZ3SdMDxYDqkkhK6IPeqLNo2+os=
 SIZE (gcc/adastrap-amd64-11.2.0-5.tar.xz) = 78100312
-SIZE (gcc/adastrap-arm-4.9.4-0.tar.xz) = 31142168
-SIZE (gcc/adastrap-hppa-8.3.0-1.tar.xz) = 48044496
 SIZE (gcc/adastrap-i386-11.2.0-3.tar.xz) = 76071292
 SIZE (gcc/adastrap-mips64-8.4.0-4.tar.xz) = 49761164
 SIZE (gcc/adastrap-powerpc-11.2.0-3.tar.xz) = 70134604
-SIZE (gcc/adastrap-sparc64-6.5.0-0.tar.xz) = 38704976
 SIZE (gcc/gcc-11.2.0.tar.xz) = 80888824
Index: 8/Makefile
===================================================================
RCS file: /cvs/ports/lang/gcc/8/Makefile,v
diff -u -p -r1.92 Makefile
--- 8/Makefile	23 Jul 2025 18:51:31 -0000	1.92
+++ 8/Makefile	8 Aug 2025 09:13:56 -0000
@@ -26,12 +26,10 @@ FULL_PKGVERSION = $V
 REVISION = 28
 
 ADASTRAP-amd64 = adastrap-amd64-$V-4.tar.xz
-ADASTRAP-arm = adastrap-arm-4.9.4-0.tar.xz
 ADASTRAP-hppa = adastrap-hppa-$V-0.tar.xz
 ADASTRAP-i386 = adastrap-i386-$V-2.tar.xz
 ADASTRAP-mips64 = adastrap-mips64-$V-4.tar.xz
 ADASTRAP-powerpc = adastrap-powerpc-$V-2.tar.xz
-ADASTRAP-sparc64 = adastrap-sparc64-6.5.0-0.tar.xz
 
 PKGNAME-main =  gcc-${FULL_PKGVERSION}
 PKGNAME-libs =	gcc-libs-${FULL_PKGVERSION}
@@ -63,9 +61,9 @@ MAINTAINER =	Pascal Stumpf <pascal@stump
 
 DISTNAME =	gcc-${FULL_VERSION}
 DISTFILES =	${DISTNAME}.tar.xz
-SUPDISTFILES.strap =	${ADASTRAP-amd64} ${ADASTRAP-arm} ${ADASTRAP-hppa} \
-		${ADASTRAP-i386} ${ADASTRAP-mips64} ${ADASTRAP-powerpc} \
-		${ADASTRAP-sparc64}
+.for _arch in ${ONLY_FOR_ARCHS-ada}
+SUPDISTFILES.strap += ${ADASTRAP-${_arch}}
+.endfor
 EXTRACT_ONLY =	${DISTNAME}.tar.xz
 
 BUILD_DEPENDS +=	devel/bison
Index: 8/distinfo
===================================================================
RCS file: /cvs/ports/lang/gcc/8/distinfo,v
diff -u -p -r1.24 distinfo
--- 8/distinfo	23 Jul 2025 18:51:31 -0000	1.24
+++ 8/distinfo	8 Aug 2025 09:13:56 -0000
@@ -1,16 +1,12 @@
 SHA256 (gcc/adastrap-amd64-8.4.0-4.tar.xz) = VgSsVnSik2DQ0BWeeyBSTkuM984F9SzNuSb9H3qzYfM=
-SHA256 (gcc/adastrap-arm-4.9.4-0.tar.xz) = sadBk8tP/65RDDIHlWE1yo9MnSUP/44Ou9064RXonto=
 SHA256 (gcc/adastrap-hppa-8.4.0-0.tar.xz) = coLL4dXisyWf6rxA12wmLb9LdSIHEbiy+2QrhFcxjBc=
 SHA256 (gcc/adastrap-i386-8.4.0-2.tar.xz) = xp0FhAW3ykFYO2zbq8PcumE6gQf+ogzn944NXaBnFZQ=
 SHA256 (gcc/adastrap-mips64-8.4.0-4.tar.xz) = d69EYvO8/89BqS5LYgjpCLAtXf1ljKxBvqQmDqjoaew=
 SHA256 (gcc/adastrap-powerpc-8.4.0-2.tar.xz) = lbnQeFaMgAuql4FjIKGVT2e1IFB8pVyXlzEiaxnvkk8=
-SHA256 (gcc/adastrap-sparc64-6.5.0-0.tar.xz) = cqpGS2beYV+CFf7X+P4voVHHT78v6SCgtksHXjP/B4E=
 SHA256 (gcc/gcc-8.4.0.tar.xz) = 4wpuUtEOHyftVRBK0jPDC9HpnPtf+YqwItyUHt0bLdQ=
 SIZE (gcc/adastrap-amd64-8.4.0-4.tar.xz) = 61575612
-SIZE (gcc/adastrap-arm-4.9.4-0.tar.xz) = 31142168
 SIZE (gcc/adastrap-hppa-8.4.0-0.tar.xz) = 48150724
 SIZE (gcc/adastrap-i386-8.4.0-2.tar.xz) = 62960280
 SIZE (gcc/adastrap-mips64-8.4.0-4.tar.xz) = 49761164
 SIZE (gcc/adastrap-powerpc-8.4.0-2.tar.xz) = 54731408
-SIZE (gcc/adastrap-sparc64-6.5.0-0.tar.xz) = 38704976
 SIZE (gcc/gcc-8.4.0.tar.xz) = 63713440