From a94f6aab7bd27a5ac71c005cec2ccc80ccd1d422 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Sat, 10 Aug 2013 14:55:29 +0200 Subject: [PATCH] Image rules: filter packages list via FFilterByBuildFeatures AddPackageFilesToHaikuImage, AddHaikuImagePackages: For convenience filter the given package file/package list through FFilterByBuildFeatures. --- build/jam/ImageRules | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build/jam/ImageRules b/build/jam/ImageRules index efe95e5a1a..4305327159 100644 --- a/build/jam/ImageRules +++ b/build/jam/ImageRules @@ -933,6 +933,7 @@ rule AddBootModuleSymlinksToHaikuImage targets rule AddPackageFilesToHaikuImage location : packages { + packages = [ FFilterByBuildFeatures $(packages) ] ; HAIKU_PACKAGES_IN_IMAGE on $(HAIKU_IMAGE_CONTAINER_NAME) = [ on $(HAIKU_IMAGE_CONTAINER_NAME) return $(HAIKU_PACKAGES_IN_IMAGE) ] $(packages) ; @@ -997,6 +998,8 @@ rule AddHaikuImagePackages packages : installationLocation installationLocation ?= common ; + packages = [ FFilterByBuildFeatures $(packages) ] ; + local package ; for package in $(packages) { local resolvedPackage = [ IsPackageAvailable $(package) ] ;