generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove fipsdso target: it isn't supported in the 2.0 module.

Browse Source
This commit is contained in:
Dr. Stephen Henson 2011-09-14 15:20:59 +00:00
parent 15094852de
commit d47d0d2b0d
1 changed files with 3 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Configure
View File

@ -656,7 +656,6 @@ my $install_prefix= "$ENV{'INSTALL_PREFIX'}";
my $cross_compile_prefix=""; my $cross_compile_prefix="";
my $fipslibdir="/usr/local/ssl/fips-2.0/lib/"; my $fipslibdir="/usr/local/ssl/fips-2.0/lib/";
my $nofipscanistercheck=0; my $nofipscanistercheck=0;
my $fipsdso=0;
my $fipscanisterinternal="n"; my $fipscanisterinternal="n";
my $fipscanisteronly = 0; my $fipscanisteronly = 0;
my $baseaddr="0xFB00000"; my $baseaddr="0xFB00000";
@ -897,14 +896,6 @@ EOF
$fipscanisterinternal="y"; $fipscanisterinternal="y";
$fipscanisteronly = 1; $fipscanisteronly = 1;
} }
elsif (/^fipsdso$/)
{
$fips = 1;
$nofipscanistercheck = 1;
$fipslibdir="";
$fipscanisterinternal="y";
$fipsdso = 1;
}
elsif (/^[-+]/) elsif (/^[-+]/)
{ {
if (/^-[lL](.*)$/ or /^-Wl,/) if (/^-[lL](.*)$/ or /^-Wl,/)
@ -1713,18 +1704,9 @@ while (<IN>)
s/^LIBZLIB=.*/LIBZLIB=$withargs{"zlib-lib"}/; s/^LIBZLIB=.*/LIBZLIB=$withargs{"zlib-lib"}/;
s/^ZLIB_INCLUDE=.*/ZLIB_INCLUDE=$withargs{"zlib-include"}/; s/^ZLIB_INCLUDE=.*/ZLIB_INCLUDE=$withargs{"zlib-include"}/;
s/^FIPSLIBDIR=.*/FIPSLIBDIR=$fipslibdir/; s/^FIPSLIBDIR=.*/FIPSLIBDIR=$fipslibdir/;
if ($fipsdso)
{
s/^FIPSCANLIB=.*/FIPSCANLIB=libfips/;
s/^SHARED_FIPS=.*/SHARED_FIPS=libfips\$(SHLIB_EXT)/;
s/^SHLIBDIRS=.*/SHLIBDIRS= crypto ssl fips/;
}
else
{
s/^FIPSCANLIB=.*/FIPSCANLIB=libcrypto/ if $fips; s/^FIPSCANLIB=.*/FIPSCANLIB=libcrypto/ if $fips;
s/^SHARED_FIPS=.*/SHARED_FIPS=/; s/^SHARED_FIPS=.*/SHARED_FIPS=/;
s/^SHLIBDIRS=.*/SHLIBDIRS= crypto ssl/; s/^SHLIBDIRS=.*/SHLIBDIRS= crypto ssl/;
}
s/^FIPSCANISTERINTERNAL=.*/FIPSCANISTERINTERNAL=$fipscanisterinternal/; s/^FIPSCANISTERINTERNAL=.*/FIPSCANISTERINTERNAL=$fipscanisterinternal/;
s/^BASEADDR=.*/BASEADDR=$baseaddr/; s/^BASEADDR=.*/BASEADDR=$baseaddr/;
s/^SHLIB_TARGET=.*/SHLIB_TARGET=$shared_target/; s/^SHLIB_TARGET=.*/SHLIB_TARGET=$shared_target/;