From 85eed25cddc53c6622ebc26ddb80806c6b0302c3 Mon Sep 17 00:00:00 2001
From: Ingo Weinhold <ingo_weinhold@gmx.de>
Date: Tue, 6 Aug 2013 03:24:14 +0200
Subject: [PATCH] AddHaikuImagePackages/IsHaikuImagePackageAdded: 2ndary arch
 fix

For the secondary architecture the same specified package name means a
different package, so we need to use the mapped name IsPackageAvailable
returns.
---
 build/jam/ImageRules | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/build/jam/ImageRules b/build/jam/ImageRules
index 7440efcec3..fd5c529a6e 100644
--- a/build/jam/ImageRules
+++ b/build/jam/ImageRules
@@ -999,15 +999,16 @@ rule AddHaikuImagePackages packages : installationLocation
 
 	local package ;
 	for package in $(packages) {
-		if ! [ on $(package) return $(HAIKU_PACKAGE_ADDED) ] {
-			if ! [ IsPackageAvailable $(package) ] {
-				Echo "AddHaikuImagePackages: package" $(package)
-					"not available!" ;
-				continue ;
-			}
+		local resolvedPackage = [ IsPackageAvailable $(package) ] ;
+		if ! $(resolvedPackage) {
+			Echo "AddHaikuImagePackages: package" $(package)
+				"not available!" ;
+			continue ;
+		}
 
-			HAIKU_PACKAGE_ADDED on $(package) = 1 ;
-			HAIKU_ADDED_PACKAGES += $(package) ;
+		if ! [ on $(resolvedPackage) return $(HAIKU_PACKAGE_ADDED) ] {
+			HAIKU_PACKAGE_ADDED on $(resolvedPackage) = 1 ;
+			HAIKU_ADDED_PACKAGES += $(resolvedPackage) ;
 
 			# download the package file and add it to the image
 			local file = [ FetchPackage $(package) ] ;
@@ -1024,7 +1025,9 @@ rule AddHaikuImagePackages packages : installationLocation
 
 rule IsHaikuImagePackageAdded package
 {
-	if [ on $(package) return $(HAIKU_PACKAGE_ADDED) ] {
+	local resolvedPackage = [ IsPackageAvailable $(package) ] ;
+	if $(resolvedPackage)
+		&& [ on $(resolvedPackage) return $(HAIKU_PACKAGE_ADDED) ] {
 		return 1 ;
 	}