From ae18461ec1ad87c67a29310349b47ffd17f475f2 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Mon, 25 Aug 2014 20:49:03 +0200 Subject: [PATCH] Fix #11155 - missing WebPositive in x86_gcc2 repository. * Instead of just checking the primary architecture, we need to check all architectures whether the webpositive build feature is enabled. --- build/jam/repositories/Haiku | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/build/jam/repositories/Haiku b/build/jam/repositories/Haiku index 85d8b74470..32efd457f8 100644 --- a/build/jam/repositories/Haiku +++ b/build/jam/repositories/Haiku @@ -20,10 +20,18 @@ local packages = haiku_$(secondaryArchs)_devel ; -if [ FIsBuildFeatureEnabled webpositive ] { - if $(TARGET_PACKAGING_ARCH) != x86_gcc2 || $(secondaryArchs) { - packages += webpositive ; +local webPositiveIsAvailable ; +local architectureObject ; +for architectureObject in [ MultiArchSubDirSetup ] { + on $(architectureObject) { + if [ FIsBuildFeatureEnabled webpositive ] { + webPositiveIsAvailable = true ; + break ; + } } } +if $(webPositiveIsAvailable) { + packages += webpositive ; +} HaikuRepository $(haikuRepository) : $(repoInfo) : $(packages:S=.hpkg) ;