diff --git a/build/jam/PackageRules b/build/jam/PackageRules index db9ab042dd6..8abcae7c013 100644 --- a/build/jam/PackageRules +++ b/build/jam/PackageRules @@ -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) ; diff --git a/src/data/package_infos/x86_64/haiku b/src/data/package_infos/x86_64/haiku index 6103364fcc2..4b12bcc5e9e 100644 --- a/src/data/package_infos/x86_64/haiku +++ b/src/data/package_infos/x86_64/haiku @@ -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