i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PackageRules: use valid macro names in defines.

Browse Source
This commit is contained in:
Jérôme Duval
2015-11-23 18:16:08 +01:00
parent dbf060a3f7
commit 3dd0c8198e
2 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/PackageRules
+2 -1
View File
@@ -108,7 +108,8 @@ rule PreprocessPackageOrRepositoryInfo target : source : architecture
+= %HAIKU_SECONDARY_PACKAGING_ARCH_SUFFIX%, ; += %HAIKU_SECONDARY_PACKAGING_ARCH_SUFFIX%, ;
} }
for feature in $(HAIKU_BUILD_FEATURES) { 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 ] ; local revisionFile = [ DetermineEffectiveHaikuRevision ] ;
src/data/package_infos/x86_64/haiku
+9 -9
View File
@@ -73,32 +73,32 @@ requires {
lib:libicuuc lib:libicuuc
lib:libncurses >= 6.0 lib:libncurses >= 6.0
#ifdef HAIKU_REGULAR_BUILD #ifdef HAIKU_REGULAR_BUILD
#ifdef HAIKU_BUILD_FEATURE_X86_64:EXPAT_ENABLED #ifdef HAIKU_BUILD_FEATURE_X86_64_EXPAT_ENABLED
lib:libexpat lib:libexpat
#endif #endif
#ifdef HAIKU_BUILD_FEATURE_X86_64:GUTENPRINT_ENABLED #ifdef HAIKU_BUILD_FEATURE_X86_64_GUTENPRINT_ENABLED
lib:libgutenprint lib:libgutenprint
#endif #endif
#ifdef HAIKU_BUILD_FEATURE_X86_64:LIBICNS_ENABLED #ifdef HAIKU_BUILD_FEATURE_X86_64_LIBICNS_ENABLED
lib:libicns lib:libicns
#endif #endif
#ifdef HAIKU_BUILD_FEATURE_X86_64:JASPER_ENABLED #ifdef HAIKU_BUILD_FEATURE_X86_64_JASPER_ENABLED
lib:libjasper lib:libjasper
#endif #endif
#ifdef HAIKU_BUILD_FEATURE_X86_64:JPEG_ENABLED #ifdef HAIKU_BUILD_FEATURE_X86_64_JPEG_ENABLED
lib:libjpeg lib:libjpeg
#endif #endif
#ifdef HAIKU_BUILD_FEATURE_X86_64:LIBPNG_ENABLED #ifdef HAIKU_BUILD_FEATURE_X86_64_LIBPNG_ENABLED
lib:libpng >= 16.0 lib:libpng >= 16.0
#endif #endif
lib:libqrencode lib:libqrencode
#ifdef HAIKU_BUILD_FEATURE_X86_64:TIFF_ENABLED #ifdef HAIKU_BUILD_FEATURE_X86_64_TIFF_ENABLED
lib:libtiff >= 5.2 lib:libtiff >= 5.2
#endif #endif
#ifdef HAIKU_BUILD_FEATURE_X86_64:LIBWEBP_ENABLED #ifdef HAIKU_BUILD_FEATURE_X86_64_LIBWEBP_ENABLED
lib:libwebp lib:libwebp
#endif #endif
#ifdef HAIKU_BUILD_FEATURE_X86_64:OPENSSL_ENABLED #ifdef HAIKU_BUILD_FEATURE_X86_64_OPENSSL_ENABLED
lib:libssl >= 1.0.0 lib:libssl >= 1.0.0
lib:libcrypto >= 1.0.0 lib:libcrypto >= 1.0.0
#endif #endif