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:
Augustin Cavalier
2021-08-27 13:50:07 -04:00
parent ece327f106
commit e3acf8917b
2 changed files with 3 additions and 4 deletions
+3 -3
View File
@@ -96,6 +96,9 @@ requires {
#ifdef HAIKU_BUILD_FEATURE_%HAIKU_PACKAGING_ARCH%_zlib_ENABLED #ifdef HAIKU_BUILD_FEATURE_%HAIKU_PACKAGING_ARCH%_zlib_ENABLED
lib:libz lib:libz
#endif #endif
#ifdef HAIKU_BUILD_FEATURE_%HAIKU_PACKAGING_ARCH%_zstd_ENABLED
lib:libzstd >= 1
#endif
#ifdef HAIKU_REGULAR_BUILD #ifdef HAIKU_REGULAR_BUILD
#ifdef HAIKU_BUILD_FEATURE_%HAIKU_PACKAGING_ARCH%_ffmpeg_ENABLED #ifdef HAIKU_BUILD_FEATURE_%HAIKU_PACKAGING_ARCH%_ffmpeg_ENABLED
@@ -137,8 +140,5 @@ requires {
#ifdef HAIKU_BUILD_FEATURE_%HAIKU_PACKAGING_ARCH%_libwebp_ENABLED #ifdef HAIKU_BUILD_FEATURE_%HAIKU_PACKAGING_ARCH%_libwebp_ENABLED
lib:libwebp lib:libwebp
#endif #endif
#ifdef HAIKU_BUILD_FEATURE_%HAIKU_PACKAGING_ARCH%_zstd_ENABLED
lib:libzstd >= 1
#endif
#endif #endif
} }
-1
View File
@@ -19,7 +19,6 @@ for architectureObject in [ MultiArchSubDirSetup ] {
UseBuildFeatureHeaders zstd ; UseBuildFeatureHeaders zstd ;
Includes [ FGristFiles ZstdCompressionAlgorithm.cpp ] Includes [ FGristFiles ZstdCompressionAlgorithm.cpp ]
: [ BuildFeatureAttribute zstd : headers ] ; : [ BuildFeatureAttribute zstd : headers ] ;
SetupFeatureObjectsDir zstd ;
} }
# BUrl uses ICU to perform IDNA conversions (unicode domain names) # BUrl uses ICU to perform IDNA conversions (unicode domain names)