From 779b940a74bcdc32f3feefd9b1f93067808a34e4 Mon Sep 17 00:00:00 2001
From: Ingo Weinhold <ingo_weinhold@gmx.de>
Date: Mon, 5 Aug 2013 23:23:48 +0200
Subject: [PATCH] PreprocessPackageInfo: define macro for secondary
 architecture

---
 build/jam/PackageRules | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/build/jam/PackageRules b/build/jam/PackageRules
index 83ac072592..83722fa37b 100644
--- a/build/jam/PackageRules
+++ b/build/jam/PackageRules
@@ -30,6 +30,7 @@ rule HaikuPackage package
 
 
 rule PreprocessPackageInfo source : directory : architecture
+	: secondaryArchitecture
 {
 	source = $(source:G=package-info-source) ;
 	SEARCH on $(source) +=
@@ -44,6 +45,9 @@ rule PreprocessPackageInfo source : directory : architecture
 		defines += HAIKU_BOOTSTRAP_BUILD ;
 		target = $(target)-bootstrap ;
 	}
+	if $(secondaryArchitecture) {
+		defines += HAIKU_SECONDARY_PACKAGING_ARCH=$(secondaryArchitecture) ;
+	}
 
 	MakeLocate $(target) : $(directory) ;
 	Depends $(target) : $(source) ;
@@ -65,6 +69,11 @@ actions PreprocessPackageInfo1
 rule BuildHaikuPackage package : packageInfo
 {
 	local architecture = $(HAIKU_PACKAGING_ARCH) ;
+	local secondaryArchitecture ;
+	if $(TARGET_PACKAGING_ARCH) != $(architecture) {
+		secondaryArchitecture = $(TARGET_PACKAGING_ARCH) ;
+	}
+
 	local grist = [ FHaikuPackageGrist $(package) ] ;
 
 	local tempDir
@@ -73,7 +82,7 @@ rule BuildHaikuPackage package : packageInfo
 
 	#  build the package info and locate the package
 	packageInfo = [ PreprocessPackageInfo $(packageInfo) : $(tempDir)
-		: $(architecture) ] ;
+		: $(architecture) : $(secondaryArchitecture) ] ;
 	MakeLocate $(package) : $(HAIKU_PACKAGES_DIR_$(architecture)) ;
 	Depends $(package) : $(packageInfo) ;