From d1251475e2aad18836353e1833887171e2ddb632 Mon Sep 17 00:00:00 2001
From: Ingo Weinhold <ingo_weinhold@gmx.de>
Date: Tue, 6 Aug 2013 03:37:22 +0200
Subject: [PATCH] Add the missing secondary arch bootstrap packages

The Haiku bootstrap image is now built with (hopefully) all required
primary and secondary architecture packages. The runtime loader is still
resisting our wish to run secondary architecture programs, though.
---
 build/jam/DefaultBuildProfiles                | 25 +++++++++++++++++++
 .../jam/repositories/HaikuPortsCross/x86_gcc2 | 11 ++++++++
 2 files changed, 36 insertions(+)

diff --git a/build/jam/DefaultBuildProfiles b/build/jam/DefaultBuildProfiles
index 066528cb7f..aea98b811c 100644
--- a/build/jam/DefaultBuildProfiles
+++ b/build/jam/DefaultBuildProfiles
@@ -137,6 +137,31 @@ rule DefineDefaultBuildProfiles
 #				texinfo
 				;
 
+			# secondary architecture packages
+			local architectureObject ;
+			for architectureObject
+					in [ MultiArchSubDirSetup $(TARGET_PACKAGING_ARCHS[2-]) ] {
+				on $(architectureObject) {
+					AddHaikuImagePackages
+						freetype
+						freetype_devel
+						icu
+						libsolv
+						ncurses
+						ncurses_devel
+						zlib
+						zlib_devel
+						:
+						system
+						;
+
+					AddHaikuImagePackages
+						binutils
+						gcc
+						;
+				}
+			}
+
 			AddOptionalHaikuImagePackages DevelopmentMin ;
 		}
 	}
diff --git a/build/jam/repositories/HaikuPortsCross/x86_gcc2 b/build/jam/repositories/HaikuPortsCross/x86_gcc2
index 29c137de36..5367814c5b 100644
--- a/build/jam/repositories/HaikuPortsCross/x86_gcc2
+++ b/build/jam/repositories/HaikuPortsCross/x86_gcc2
@@ -29,8 +29,14 @@ BootstrapPackageRepository HaikuPortsCross
 	zlib_bootstrap_devel-1.2.8-2
 
 	secondary_x86 @{
+		binutils_bootstrap_x86-2.23.2_2013_04_09-3
+		freetype_bootstrap_x86-2.4.9-1
+		freetype_bootstrap_x86_devel-2.4.9-1
+		gcc_bootstrap_x86-4.7.3_2013_08_03-1
 		icu_bootstrap_x86-4.8.1.1-1
 		icu_bootstrap_x86_devel-4.8.1.1-1
+		ncurses_bootstrap_x86-5.9-1
+		ncurses_bootstrap_x86_devel-5.9-1
 		zlib_bootstrap_x86-1.2.8-2
 		zlib_bootstrap_x86_devel-1.2.8-2
 	}@ # secondary_x86
@@ -38,6 +44,11 @@ BootstrapPackageRepository HaikuPortsCross
 	# repository architecture packages (stage 2)
 	libsolv_bootstrap-0.3.0_haiku_2013_06_16-1
 	libsolv_bootstrap_devel-0.3.0_haiku_2013_06_16-1
+
+	secondary_x86 @{
+		libsolv_bootstrap_x86-0.3.0_haiku_2013_06_16-1
+		libsolv_bootstrap_x86_devel-0.3.0_haiku_2013_06_16-1
+	}@ # secondary_x86
 	:
 	# source packages
 	autoconf_bootstrap