Fix usage of Zstd build feature.
We do not actually need a SetupFeatureObjcetsDir here, as this build feature is used unconditionally if it is available (unlike OpenSSL which is not, and which needs a feature objects directory.) It appears FeatureObjectsDir expects to be called unconditionally, i.e. in an "else" as well as "if", so this actually caused some build oddities. Additionally, since it is built unconditionally if available, we have to put it outside the "regular" checks in the PackageInfo so that it will be included in the images. This fixes booting @minimum images, which was apparently broken at some point when "zstd" was inadvertently removed.
This commit is contained in:
@@ -96,6 +96,9 @@ requires {
|
||||
#ifdef HAIKU_BUILD_FEATURE_%HAIKU_PACKAGING_ARCH%_zlib_ENABLED
|
||||
lib:libz
|
||||
#endif
|
||||
#ifdef HAIKU_BUILD_FEATURE_%HAIKU_PACKAGING_ARCH%_zstd_ENABLED
|
||||
lib:libzstd >= 1
|
||||
#endif
|
||||
|
||||
#ifdef HAIKU_REGULAR_BUILD
|
||||
#ifdef HAIKU_BUILD_FEATURE_%HAIKU_PACKAGING_ARCH%_ffmpeg_ENABLED
|
||||
@@ -137,8 +140,5 @@ requires {
|
||||
#ifdef HAIKU_BUILD_FEATURE_%HAIKU_PACKAGING_ARCH%_libwebp_ENABLED
|
||||
lib:libwebp
|
||||
#endif
|
||||
#ifdef HAIKU_BUILD_FEATURE_%HAIKU_PACKAGING_ARCH%_zstd_ENABLED
|
||||
lib:libzstd >= 1
|
||||
#endif
|
||||
#endif
|
||||
}
|
||||
|
||||
@@ -19,7 +19,6 @@ for architectureObject in [ MultiArchSubDirSetup ] {
|
||||
UseBuildFeatureHeaders zstd ;
|
||||
Includes [ FGristFiles ZstdCompressionAlgorithm.cpp ]
|
||||
: [ BuildFeatureAttribute zstd : headers ] ;
|
||||
SetupFeatureObjectsDir zstd ;
|
||||
}
|
||||
|
||||
# BUrl uses ICU to perform IDNA conversions (unicode domain names)
|
||||
|
||||
Reference in New Issue
Block a user