From 3dd0c8198e103c8920fb6c1c4d99f148abea9f94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= Date: Mon, 23 Nov 2015 18:16:08 +0100 Subject: [PATCH] PackageRules: use valid macro names in defines. --- build/jam/PackageRules | 3 ++- src/data/package_infos/x86_64/haiku | 18 +++++++++--------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/build/jam/PackageRules b/build/jam/PackageRules index 8abcae7c01..2d15395417 100644 --- a/build/jam/PackageRules +++ b/build/jam/PackageRules @@ -108,7 +108,8 @@ rule PreprocessPackageOrRepositoryInfo target : source : architecture += %HAIKU_SECONDARY_PACKAGING_ARCH_SUFFIX%, ; } for feature in $(HAIKU_BUILD_FEATURES) { - defines += HAIKU_BUILD_FEATURE_$(feature:U)_ENABLED ; + local featureSplit = [ FSplitString $(feature) : ":" ] ; + defines += HAIKU_BUILD_FEATURE_$(featureSplit:UJ=_)_ENABLED ; } local revisionFile = [ DetermineEffectiveHaikuRevision ] ; diff --git a/src/data/package_infos/x86_64/haiku b/src/data/package_infos/x86_64/haiku index 4b12bcc5e9..4a86508d52 100644 --- a/src/data/package_infos/x86_64/haiku +++ b/src/data/package_infos/x86_64/haiku @@ -73,32 +73,32 @@ requires { lib:libicuuc lib:libncurses >= 6.0 #ifdef HAIKU_REGULAR_BUILD -#ifdef HAIKU_BUILD_FEATURE_X86_64:EXPAT_ENABLED +#ifdef HAIKU_BUILD_FEATURE_X86_64_EXPAT_ENABLED lib:libexpat #endif -#ifdef HAIKU_BUILD_FEATURE_X86_64:GUTENPRINT_ENABLED +#ifdef HAIKU_BUILD_FEATURE_X86_64_GUTENPRINT_ENABLED lib:libgutenprint #endif -#ifdef HAIKU_BUILD_FEATURE_X86_64:LIBICNS_ENABLED +#ifdef HAIKU_BUILD_FEATURE_X86_64_LIBICNS_ENABLED lib:libicns #endif -#ifdef HAIKU_BUILD_FEATURE_X86_64:JASPER_ENABLED +#ifdef HAIKU_BUILD_FEATURE_X86_64_JASPER_ENABLED lib:libjasper #endif -#ifdef HAIKU_BUILD_FEATURE_X86_64:JPEG_ENABLED +#ifdef HAIKU_BUILD_FEATURE_X86_64_JPEG_ENABLED lib:libjpeg #endif -#ifdef HAIKU_BUILD_FEATURE_X86_64:LIBPNG_ENABLED +#ifdef HAIKU_BUILD_FEATURE_X86_64_LIBPNG_ENABLED lib:libpng >= 16.0 #endif lib:libqrencode -#ifdef HAIKU_BUILD_FEATURE_X86_64:TIFF_ENABLED +#ifdef HAIKU_BUILD_FEATURE_X86_64_TIFF_ENABLED lib:libtiff >= 5.2 #endif -#ifdef HAIKU_BUILD_FEATURE_X86_64:LIBWEBP_ENABLED +#ifdef HAIKU_BUILD_FEATURE_X86_64_LIBWEBP_ENABLED lib:libwebp #endif -#ifdef HAIKU_BUILD_FEATURE_X86_64:OPENSSL_ENABLED +#ifdef HAIKU_BUILD_FEATURE_X86_64_OPENSSL_ENABLED lib:libssl >= 1.0.0 lib:libcrypto >= 1.0.0 #endif