i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Image rules: filter packages list via FFilterByBuildFeatures

Browse Source 
AddPackageFilesToHaikuImage, AddHaikuImagePackages: For convenience
filter the given package file/package list through
FFilterByBuildFeatures.
This commit is contained in:
Ingo Weinhold
2013-08-10 14:55:29 +02:00
parent 271e9484ed
commit a94f6aab7b
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/ImageRules
+3
View File
@@ -933,6 +933,7 @@ rule AddBootModuleSymlinksToHaikuImage targets
rule AddPackageFilesToHaikuImage location : packages rule AddPackageFilesToHaikuImage location : packages
{ {
packages = [ FFilterByBuildFeatures $(packages) ] ;
HAIKU_PACKAGES_IN_IMAGE on $(HAIKU_IMAGE_CONTAINER_NAME) HAIKU_PACKAGES_IN_IMAGE on $(HAIKU_IMAGE_CONTAINER_NAME)
= [ on $(HAIKU_IMAGE_CONTAINER_NAME) return $(HAIKU_PACKAGES_IN_IMAGE) ] = [ on $(HAIKU_IMAGE_CONTAINER_NAME) return $(HAIKU_PACKAGES_IN_IMAGE) ]
$(packages) ; $(packages) ;
@@ -997,6 +998,8 @@ rule AddHaikuImagePackages packages : installationLocation
installationLocation ?= common ; installationLocation ?= common ;
packages = [ FFilterByBuildFeatures $(packages) ] ;
local package ; local package ;
for package in $(packages) { for package in $(packages) {
local resolvedPackage = [ IsPackageAvailable $(package) ] ; local resolvedPackage = [ IsPackageAvailable $(package) ] ;