haiku-x86_64: make some dependencies feature dependent.

haiku · Nov 22, 2015 · b8c67b2 · b8c67b2
1 parent 62eec60
commit b8c67b2
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 0 deletions.
diff --git 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
@@ -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