mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2024-11-21 01:15:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

Make fipscanisteronly work with WIN32 build system.

Browse Source
This commit is contained in:
Dr. Stephen Henson 2011-02-22 16:36:20 +00:00
parent 558ddad34f
commit d989e4f8c2
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
util/mk1mf.pl
View File

@ -25,11 +25,16 @@ my $fips_sha1_exe_path = "";
local $fipscanisterbuild = 0; local $fipscanisterbuild = 0;
my $fipscanisteronly = 0;
my $fipslibdir = ""; my $fipslibdir = "";
my $baseaddr = ""; my $baseaddr = "";
my $ex_l_libs = ""; my $ex_l_libs = "";
my $build_targets = "lib exe";
my $libs_dep = "\$(O_CRYPTO) \$(O_SSL)";
# Options to import from top level Makefile # Options to import from top level Makefile
my %mf_import = ( my %mf_import = (
@ -371,7 +376,7 @@ for (;;)
if ($key eq "LIBKRB5") if ($key eq "LIBKRB5")
{ $ex_libs .= " $val" if $val ne "";} { $ex_libs .= " $val" if $val ne "";}
if ($key eq "TEST") if ($key eq "TEST" && (!$fipscanisteronly || $dir =~ /^fips/ ))
{ $test.=&var_add($dir,$val, 0); } { $test.=&var_add($dir,$val, 0); }
if (($key eq "PROGS") || ($key eq "E_OBJ")) if (($key eq "PROGS") || ($key eq "E_OBJ"))
@ -448,7 +453,7 @@ if ($fips)
$lib_obj{"FIPS"} .= "$_ "; $lib_obj{"FIPS"} .= "$_ ";
} }
} }
else elsif (!$fipscanisteronly)
{ {
$lib_obj{"CRYPTO"} .= "$_ "; $lib_obj{"CRYPTO"} .= "$_ ";
} }
@ -498,7 +503,7 @@ if ($fips)
{ {
if (!$shlib) if (!$shlib)
{ {
$ex_build_targets .= " \$(LIB_D)$o$crypto_compat \$(PREMAIN_DSO_EXE)"; $build_targets .= " \$(LIB_D)$o$crypto_compat \$(PREMAIN_DSO_EXE)";
$ex_l_libs .= " \$(O_FIPSCANISTER)"; $ex_l_libs .= " \$(O_FIPSCANISTER)";
$ex_libs_dep .= " \$(O_FIPSCANISTER)" if $fipscanisterbuild; $ex_libs_dep .= " \$(O_FIPSCANISTER)" if $fipscanisterbuild;
} }
@ -521,6 +526,13 @@ if ($fips)
} }
} }
if ($fipscanisteronly)
{
$build_targets = "\$(O_FIPSCANISTER) \$(T_EXE)";
$libs_dep = "";
}
if ($shlib) if ($shlib)
{ {
$extra_install= <<"EOF"; $extra_install= <<"EOF";
@ -659,13 +671,13 @@ INC=-I\$(INC_D) -I\$(INCL_D)
APP_CFLAGS=\$(INC) \$(CFLAG) \$(APP_CFLAG) APP_CFLAGS=\$(INC) \$(CFLAG) \$(APP_CFLAG)
LIB_CFLAGS=\$(INC) \$(CFLAG) \$(LIB_CFLAG) LIB_CFLAGS=\$(INC) \$(CFLAG) \$(LIB_CFLAG)
SHLIB_CFLAGS=\$(INC) \$(CFLAG) \$(LIB_CFLAG) \$(SHLIB_CFLAG) SHLIB_CFLAGS=\$(INC) \$(CFLAG) \$(LIB_CFLAG) \$(SHLIB_CFLAG)
LIBS_DEP=\$(O_CRYPTO) \$(O_SSL) $ex_libs_dep LIBS_DEP=$libs_dep
############################################# #############################################
EOF EOF
$rules=<<"EOF"; $rules=<<"EOF";
all: banner \$(TMP_D) \$(BIN_D) \$(TEST_D) \$(LIB_D) \$(INCO_D) headers \$(FIPS_SHA1_EXE) lib exe $ex_build_targets all: banner \$(TMP_D) \$(BIN_D) \$(TEST_D) \$(LIB_D) \$(INCO_D) headers \$(FIPS_SHA1_EXE) $build_targets
banner: banner:
$banner $banner
@ -1325,6 +1337,7 @@ sub read_options
"no-zlib-dynamic" => 0, "no-zlib-dynamic" => 0,
"fips" => \$fips, "fips" => \$fips,
"fipscanisterbuild" => [\$fips, \$fipscanisterbuild], "fipscanisterbuild" => [\$fips, \$fipscanisterbuild],
"fipscanisteronly" => [\$fips, \$fipscanisterbuild, \$fipscanisteronly],
); );
if (exists $valid_options{$_}) if (exists $valid_options{$_})