From bbb52cd4fe48c6f83e146fe037daef2572adccb8 Mon Sep 17 00:00:00 2001
From: P. J. McDermott <pjm@nac.net>
Date: Tue, 18 Mar 2014 15:31:22 -0400
Subject: Don't install cross gcc-defaults pkgs in stage1.

---
diff --git a/bootstrap-stage1-install.sh b/bootstrap-stage1-install.sh
index 9455fcc..318ff17 100755
--- a/bootstrap-stage1-install.sh
+++ b/bootstrap-stage1-install.sh
@@ -92,6 +92,16 @@ install_packages()
 			"build-essential-${ARCH}_"*) ;;
 			'build-essential-common_'*) ;;
 			'build-essential-'*) continue ;;
+			"gcc-${ARCH}_"*) ;;
+			"gcc-"*"-${ARCH}_"*) ;;
+			'gcc-'*'-common_'*) ;;
+			'gcc-'*'-locales_'*) ;;
+			'gcc-'*) continue ;;
+			"g++-${ARCH}_"*) ;;
+			"g++-"*"-${ARCH}_"*) ;;
+			'g++-'*'-common_'*) ;;
+			'g++-'*'-locales_'*) ;;
+			'g++-'*) continue ;;
 		esac
 		log 'Installing package %s...' "${pkg%%_*}"
 		tar -xzOf "${opk}" data.tar.gz | tar -xz
@@ -148,6 +158,16 @@ configure_packages()
 			"build-essential-${ARCH}_"*) ;;
 			'build-essential-common_'*) ;;
 			'build-essential-'*) continue ;;
+			"gcc-${ARCH}_"*) ;;
+			"gcc-"*"-${ARCH}_"*) ;;
+			'gcc-'*'-common_'*) ;;
+			'gcc-'*'-locales_'*) ;;
+			'gcc-'*) continue ;;
+			"g++-${ARCH}_"*) ;;
+			"g++-"*"-${ARCH}_"*) ;;
+			'g++-'*'-common_'*) ;;
+			'g++-'*'-locales_'*) ;;
+			'g++-'*) continue ;;
 		esac
 		pkg="${pkg%%_*}"
 		for entry in $(tar -xzOf "${opk}" control.tar.gz | tar -tz); do
diff --git a/bootstrap-stage1-test.sh b/bootstrap-stage1-test.sh
index 543fcd5..2bb21ba 100755
--- a/bootstrap-stage1-test.sh
+++ b/bootstrap-stage1-test.sh
@@ -78,6 +78,16 @@ test_packages()
 			"build-essential-${ARCH}_"*) ;;
 			'build-essential-common_'*) ;;
 			'build-essential-'*) continue ;;
+			"gcc-${ARCH}_"*) ;;
+			"gcc-"*"-${ARCH}_"*) ;;
+			'gcc-'*'-common_'*) ;;
+			'gcc-'*'-locales_'*) ;;
+			'gcc-'*) continue ;;
+			"g++-${ARCH}_"*) ;;
+			"g++-"*"-${ARCH}_"*) ;;
+			'g++-'*'-common_'*) ;;
+			'g++-'*'-locales_'*) ;;
+			'g++-'*) continue ;;
 		esac
 		cp "${opk}" .
 	done
--
cgit v0.9.1