From 2f77aead9ce24ec4c94ef6b7c49d115b7edbb39f Mon Sep 17 00:00:00 2001
From: Matt Turner <mattst88@gentoo.org>
Date: Thu, 21 May 2026 13:08:27 -0400
Subject: [PATCH] crossdev: skip binpkg for intermediate cross-compiler stages

Headers-only and stage1 builds get superseded by later stages;
generating binpkgs for them wastes time and pollutes the binpkg repo
with packages that will never be used.

- kernel headers quick/stage1: suppress when a later stage rebuilds them
- libc headers-only: suppress when stage3 builds the full libc
- gcc stage1: suppress when stage4 builds the full compiler
- K2PKG/K3PKG stage1: suppress when stage3 rebuilds them
---
 crossdev | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/crossdev b/crossdev
index 560ff46..b9f0619 100755
--- a/crossdev
+++ b/crossdev
@@ -1955,7 +1955,9 @@ if ! ex_fast ; then
 		# first install headers if requested
 		if with_headers ; then
 			# install kernel headers (since the C library often uses them)
-			USE="${KUSE} ${USE} headers-only" doemerge ${KPKG} ${KPKG}-quick
+			USE="${KUSE} ${USE} headers-only" \
+			EOPTS="${EOPTS}$(is_s2 && printf ' --buildpkg=n')" \
+				doemerge ${KPKG} ${KPKG}-quick
 
 			if [[ -n ${LPKG} ]] ; then
 				# install C library headers
@@ -1963,7 +1965,7 @@ if ! ex_fast ; then
 				# a dependency on newer gcc versions that we don't
 				# care about at this point -- we aren't compiling yet
 				USE="${LUSE} ${USE} ${LUSE_DISABLE} headers-only" \
-				EOPTS="${EOPTS} --nodeps" \
+				EOPTS="${EOPTS} --nodeps$(is_s3 && printf ' --buildpkg=n')" \
 					doemerge ${LPKG} ${LPKG}-headers
 			fi
 		fi
@@ -1975,6 +1977,7 @@ if ! ex_fast ; then
 				doemerge ${RPKG}
 		else
 			USE="${GUSE} ${USE} ${GUSE_DISABLE_STAGE_1}" \
+			EOPTS="${EOPTS}$(is_s4 && printf ' --buildpkg=n')" \
 				doemerge ${GPKG} ${GPKG}-stage1
 		fi
 
@@ -1985,6 +1988,7 @@ if ! ex_fast ; then
 		set_eopts_on_pkg_status ${KPKG} headers-only
 
 		USE="${KUSE} ${USE} headers-only" \
+		EOPTS="${EOPTS}$([[ ${K2PKG} != "[none]" ]] && printf ' --buildpkg=n')" \
 			doemerge ${KPKG} ${KPKG}-stage1
 
 		if [[ ${K2PKG} != "[none]" ]] ; then
@@ -1993,6 +1997,7 @@ if ! ex_fast ; then
 			set_eopts_on_pkg_status ${K2PKG} headers-only
 
 			USE="${KUSE} ${USE} headers-only" \
+			EOPTS="${EOPTS}$(is_s3 && printf ' --buildpkg=n')" \
 				doemerge ${K2PKG} ${K2PKG}-stage1
 
 			# Go again now we have it.
@@ -2006,6 +2011,7 @@ if ! ex_fast ; then
 			set_eopts_on_pkg_status ${K3PKG} headers-only
 
 			USE="${KUSE} ${USE} headers-only" \
+			EOPTS="${EOPTS}$(is_s3 && printf ' --buildpkg=n')" \
 				doemerge ${K3PKG} ${K3PKG}-stage1
 		fi
 	fi