From c5c31f4118237acb96dc335732109ebc1009c49d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= Date: Tue, 24 Nov 2015 20:20:52 +0100 Subject: [PATCH] haiku-x86/haiku-x86_gcc2: make some dependencies feature dependent. --- src/data/package_infos/x86/haiku | 16 ++++++++++++++++ src/data/package_infos/x86_gcc2/haiku | 16 ++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/src/data/package_infos/x86/haiku b/src/data/package_infos/x86/haiku index 97f8eb779d..e3d5727cc0 100644 --- a/src/data/package_infos/x86/haiku +++ b/src/data/package_infos/x86/haiku @@ -74,15 +74,31 @@ requires { lib:libicuuc lib:libncurses >= 6.0 #ifdef HAIKU_REGULAR_BUILD +#ifdef HAIKU_BUILD_FEATURE_X86_EXPAT_ENABLED lib:libexpat +#endif +#ifdef HAIKU_BUILD_FEATURE_X86_GUTENPRINT_ENABLED lib:libgutenprint +#endif +#ifdef HAIKU_BUILD_FEATURE_X86_LIBICNS_ENABLED lib:libicns +#endif +#ifdef HAIKU_BUILD_FEATURE_X86_JASPER_ENABLED lib:libjasper +#endif +#ifdef HAIKU_BUILD_FEATURE_X86_JPEG_ENABLED lib:libjpeg +#endif +#ifdef HAIKU_BUILD_FEATURE_X86_LIBPNG_ENABLED lib:libpng >= 16.0 +#endif lib:libqrencode +#ifdef HAIKU_BUILD_FEATURE_X86_TIFF_ENABLED lib:libtiff >= 5.2 +#endif +#ifdef HAIKU_BUILD_FEATURE_X86_LIBWEBP_ENABLED lib:libwebp +#endif #endif lib:libsolv lib:libsolvext diff --git a/src/data/package_infos/x86_gcc2/haiku b/src/data/package_infos/x86_gcc2/haiku index eae0aea1a2..8115ac4b47 100644 --- a/src/data/package_infos/x86_gcc2/haiku +++ b/src/data/package_infos/x86_gcc2/haiku @@ -74,15 +74,31 @@ requires { lib:libicuuc lib:libncurses >= 6.0 #ifdef HAIKU_REGULAR_BUILD +#ifdef HAIKU_BUILD_FEATURE_X86_GCC2_EXPAT_ENABLED lib:libexpat +#endif +#ifdef HAIKU_BUILD_FEATURE_X86_GCC2_GUTENPRINT_ENABLED lib:libgutenprint +#endif +#ifdef HAIKU_BUILD_FEATURE_X86_GCC2_LIBICNS_ENABLED lib:libicns +#endif +#ifdef HAIKU_BUILD_FEATURE_X86_GCC2_JASPER_ENABLED lib:libjasper +#endif +#ifdef HAIKU_BUILD_FEATURE_X86_GCC2_JPEG_ENABLED lib:libjpeg +#endif +#ifdef HAIKU_BUILD_FEATURE_X86_GCC2_LIBPNG_ENABLED lib:libpng >= 16.0 +#endif lib:libqrencode +#ifdef HAIKU_BUILD_FEATURE_X86_GCC2_TIFF_ENABLED lib:libtiff >= 5.2 +#endif +#ifdef HAIKU_BUILD_FEATURE_X86_GCC2_LIBWEBP_ENABLED lib:libwebp +#endif #endif lib:libsolv lib:libsolvext