From 00b8bfde15b28636eced339c15c9426095009562 Mon Sep 17 00:00:00 2001
From: Ingo Weinhold <ingo_weinhold@gmx.de>
Date: Sat, 10 Aug 2013 14:58:21 +0200
Subject: [PATCH] EnableBuildFeatures: deal with duplicate invocations

---
 build/jam/BuildFeatureRules | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/build/jam/BuildFeatureRules b/build/jam/BuildFeatureRules
index af51fcd817..04673693e5 100644
--- a/build/jam/BuildFeatureRules
+++ b/build/jam/BuildFeatureRules
@@ -155,8 +155,9 @@ rule EnableBuildFeatures features : specification
 
 	features = [ FQualifiedBuildFeatureName $(features) ] ;
 
-	if ! $(specification)
-		|| [ FMatchesBuildFeatures $(specification) ] {
+	if ! $(HAIKU_BUILD_FEATURE_$(feature:U)_ENABLED)
+		&& ( ! $(specification)
+			|| [ FMatchesBuildFeatures $(specification) ] ) {
 		local feature ;
 		for feature in $(features) {
 			HAIKU_BUILD_FEATURES += $(feature) ;