Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

haiku-x86_64: make some dependencies feature dependent.

Browse Source
This commit is contained in:
Jérôme Duval 2015-11-22 11:46:23 +01:00
parent 62eec60079
commit b8c67b27cc
2 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
build/jam/PackageRules
View File

@ -107,6 +107,9 @@ rule PreprocessPackageOrRepositoryInfo target : source : architecture
sedReplacements
+= %HAIKU_SECONDARY_PACKAGING_ARCH_SUFFIX%, ;
}
for feature in $(HAIKU_BUILD_FEATURES) {
defines += HAIKU_BUILD_FEATURE_$(feature:U)_ENABLED ;
}
local revisionFile = [ DetermineEffectiveHaikuRevision ] ;
Depends $(target) : $(source) $(revisionFile) ;

18
src/data/package_infos/x86_64/haiku
View File

@ -73,17 +73,35 @@ requires {
lib:libicuuc
lib:libncurses >= 6.0
#ifdef HAIKU_REGULAR_BUILD
#ifdef HAIKU_BUILD_FEATURE_X86_64:EXPAT_ENABLED
lib:libexpat
#endif
#ifdef HAIKU_BUILD_FEATURE_X86_64:GUTENPRINT_ENABLED
lib:libgutenprint
#endif
#ifdef HAIKU_BUILD_FEATURE_X86_64:LIBICNS_ENABLED
lib:libicns
#endif
#ifdef HAIKU_BUILD_FEATURE_X86_64:JASPER_ENABLED
lib:libjasper
#endif
#ifdef HAIKU_BUILD_FEATURE_X86_64:JPEG_ENABLED
lib:libjpeg
#endif
#ifdef HAIKU_BUILD_FEATURE_X86_64:LIBPNG_ENABLED
lib:libpng >= 16.0
#endif
lib:libqrencode
#ifdef HAIKU_BUILD_FEATURE_X86_64:TIFF_ENABLED
lib:libtiff >= 5.2
#endif
#ifdef HAIKU_BUILD_FEATURE_X86_64:LIBWEBP_ENABLED
lib:libwebp
#endif
#ifdef HAIKU_BUILD_FEATURE_X86_64:OPENSSL_ENABLED
lib:libssl >= 1.0.0
lib:libcrypto >= 1.0.0
#endif
#endif
lib:libsolv
lib:libsolvext