diff options
| author | Todd Short <tshort@akamai.com> | 2021-08-09 16:56:37 -0400 |
|---|---|---|
| committer | Todd Short <todd.short@me.com> | 2022-10-18 09:30:21 -0400 |
| commit | caf9317d7d75213990014e07048384be15688889 (patch) | |
| tree | 50cf59d363c17f389d6c8dbc2372795e3e53658d /Configurations | |
| parent | 12e96a23604a7aa1cd8f83486b02f1bcab6d468f (diff) | |
Add ZSTD compression support (RFC8478bis)
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Hugo Landau <hlandau@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/18186)
Diffstat (limited to 'Configurations')
| -rw-r--r-- | Configurations/00-base-templates.conf | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/Configurations/00-base-templates.conf b/Configurations/00-base-templates.conf index 4bc1915906..55da5ec56c 100644 --- a/Configurations/00-base-templates.conf +++ b/Configurations/00-base-templates.conf @@ -52,6 +52,8 @@ my %targets=( push @defs, "BROTLI_SHARED" unless $disabled{"brotli-dynamic"}; push @defs, "ZLIB" unless $disabled{zlib}; push @defs, "ZLIB_SHARED" unless $disabled{"zlib-dynamic"}; + push @defs, "ZSTD" unless $disabled{zstd}; + push @defs, "ZSTD_SHARED" unless $disabled{"zstd-dynamic"}; return [ @defs ]; }, includes => @@ -61,6 +63,8 @@ my %targets=( if !$disabled{brotli} && $withargs{brotli_include}; push @incs, $withargs{zlib_include} if !$disabled{zlib} && $withargs{zlib_include}; + push @incs, $withargs{zstd_include} + if !$disabled{zstd} && $withargs{zstd_include}; return [ @incs ]; }, }, @@ -77,6 +81,7 @@ my %targets=( my @libs = (); push(@libs, "-L".$withargs{zlib_lib}) if $withargs{zlib_lib}; push(@libs, "-L".$withargs{brotli_lib}) if $withargs{brotli_lib}; + push(@libs, "-L".$withargs{zstd_lib}) if $withargs{zstd_lib}; return join(" ", @libs); }, ex_libs => @@ -89,6 +94,7 @@ my %targets=( push(@libs, "-lbrotlicommon"); push(@libs, "-lm"); } + push(@libs, "-lzstd") if !defined($disabled{zstd}) && defined($disabled{"zstd-dynamic"}); return join(" ", @libs); }, HASHBANGPERL => "/usr/bin/env perl", # Only Unix actually cares @@ -123,6 +129,11 @@ my %targets=( push(@libs, $withargs{zlib_lib} // "ZLIB1"); } } + unless ($disabled{zstd}) { + if (defined($disabled{"zstd-dynamic"})) { + push(@libs, $withargs{zstd_lib} // "libzstd"); + } + } unless ($disabled{brotli}) { if (defined($disabled{"brotli-dynamic"})) { my $path = ""; |