diff options
| author | Matt Caswell <matt@openssl.org> | 2016-03-17 11:50:23 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2016-03-18 12:09:27 +0000 |
| commit | 114de5b59502e1764c14082e14f07562ad4e6a15 (patch) | |
| tree | 87fe1abb8d2ff7c4c061faeb95a2b80c1d568d02 /util/mk1mf.pl | |
| parent | bb4cc75b1ea8fb85ed9299dd6d5124eec686359c (diff) | |
Ensure that no-comp functions are flagged as such
mkdef.pl was not detecting no-comp functions. This updates the header file
so that mkdef.pl detects that no-comp applies, and the functions are marked
accordingly.
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'util/mk1mf.pl')
| -rwxr-xr-x | util/mk1mf.pl | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/util/mk1mf.pl b/util/mk1mf.pl index 69bc89530e..f03f83dacd 100755 --- a/util/mk1mf.pl +++ b/util/mk1mf.pl @@ -275,9 +275,10 @@ $cflags.=" -DOPENSSL_NO_AUTOALGINIT" if $no_autoalginit; $cflags.=" -DOPENSSL_NO_AUTOERRINIT" if $no_autoerrinit; $cflags.=" -DOPENSSL_FIPS" if $fips; $cflags.=" -DOPENSSL_NO_EC2M" if $no_ec2m; -$cflags.= " -DZLIB" if $zlib_opt; -$cflags.= " -DZLIB_SHARED" if $zlib_opt == 2; +$cflags.=" -DZLIB" if $zlib_opt; +$cflags.=" -DZLIB_SHARED" if $zlib_opt == 2; $cflags.=" -DOPENSSL_PIC"; +$cflags.=" -DOPENSSL_NO_COMP" if $no_comp; if ($no_static_engine) { @@ -1004,6 +1005,7 @@ sub var_add return("") if $no_dh && $dir =~ /\/dh/; return("") if $no_ec && $dir =~ /\/ec/; return("") if $no_cms && $dir =~ /\/cms/; + return("") if $no_comp && $dir =~ /\/comp/; return("") if !$fips && $dir =~ /^fips/; if ($no_des && $dir =~ /\/des/) { @@ -1402,6 +1404,7 @@ sub read_options "no-zlib-dynamic" => 0, "no-ssl-trace" => 0, "no-unit-test" => 0, + "no-comp" => \$no_comp, "no-deprecated" => 0, "no-ocb" => 0, "no-crypto-mdebug" => 0, @@ -1426,7 +1429,6 @@ sub read_options } } } - elsif (/^no-comp$/) { $xcflags = "-DOPENSSL_NO_COMP $xcflags"; } elsif (/^enable-zlib$/) { $zlib_opt = 1 if $zlib_opt == 0 } elsif (/^enable-zlib-dynamic$/) { |