X-Git-Url: https://git.openssl.org/gitweb/?a=blobdiff_plain;f=Configure;h=2996cd1b4a9b92417cfc16b11a13aa30752e695b;hb=a1f63873ce33abf8ffc7b234ea27b587e1bcc0f2;hp=5f2be9cf3c9e55391fd283fbd9e1197938cbf469;hpb=79f47ef507c945f4c73bcf8eb12f2caef19dc04e;p=openssl.git diff --git a/Configure b/Configure index 5f2be9cf3c..2996cd1b4a 100755 --- a/Configure +++ b/Configure @@ -29,6 +29,24 @@ $SIG{__DIE__} = \&death_handler; my $usage="Usage: Configure [no- ...] [enable- ...] [-Dxxx] [-lxxx] [-Lxxx] [-fxxx] [-Kxxx] [no-hw-xxx|no-hw] [[no-]threads] [[no-]shared] [[no-]zlib|zlib-dynamic] [no-asm] [no-egd] [sctp] [386] [--prefix=DIR] [--openssldir=OPENSSLDIR] [--with-xxx[=vvv]] [--config=FILE] os/compiler[:flags]\n"; +my $banner = <<"EOF"; + +********************************************************************** +*** *** +*** OpenSSL has been successfully configured *** +*** *** +*** If you encounter a problem while building, please open an *** +*** issue on GitHub *** +*** and include the output from the following command: *** +*** *** +*** perl configdata.pm --dump *** +*** *** +*** (If you are new to OpenSSL, you might want to consult the *** +*** 'Troubleshooting' section in the INSTALL.md file first) *** +*** *** +********************************************************************** +EOF + # Options: # # --config add the given configuration file, which will be read after @@ -43,6 +61,7 @@ my $usage="Usage: Configure [no- ...] [enable- ...] [-Dxxx] [-lx # given with --prefix. # This becomes the value of OPENSSLDIR in Makefile and in C. # (Default: PREFIX/ssl) +# --banner=".." Output specified text instead of default completion banner # # --cross-compile-prefix Add specified prefix to binutils components. # @@ -379,7 +398,7 @@ my @dtls = qw(dtls1 dtls1_2); # For developers: keep it sorted alphabetically my @disablables = ( - "acvp_tests", + "acvp-tests", "afalgeng", "aria", "asan", @@ -414,9 +433,9 @@ my @disablables = ( "dynamic-engine", "ec", "ec2m", + "ec_nistp_64_gcc_128", "ecdh", "ecdsa", - "ec_nistp_64_gcc_128", "egd", "engine", "err", @@ -424,8 +443,8 @@ my @disablables = ( "filenames", "fips", "fips-securitychecks", - "fuzz-libfuzzer", "fuzz-afl", + "fuzz-libfuzzer", "gost", "idea", "ktls", @@ -438,11 +457,11 @@ my @disablables = ( "msan", "multiblock", "nextprotoneg", - "pinshared", "ocb", "ocsp", "padlockeng", "pic", + "pinshared", "poly1305", "posix-io", "psk", @@ -479,8 +498,8 @@ my @disablables = ( "ui-console", "unit-test", "uplink", - "whirlpool", "weak-ssl-ciphers", + "whirlpool", "zlib", "zlib-dynamic", ); @@ -512,6 +531,8 @@ my %deprecated_disablables = ( # All of the following are disabled by default: our %disabled = ( # "what" => "comment" + "fips" => "default", + "acvp-tests" => "default", "asan" => "default", "buildtest-c++" => "default", "crypto-mdebug" => "default", @@ -520,8 +541,9 @@ our %disabled = ( # "what" => "comment" "ec_nistp_64_gcc_128" => "default", "egd" => "default", "external-tests" => "default", - "fuzz-libfuzzer" => "default", "fuzz-afl" => "default", + "fuzz-libfuzzer" => "default", + "ktls" => "default", "md2" => "default", "msan" => "default", "rc5" => "default", @@ -535,7 +557,6 @@ our %disabled = ( # "what" => "comment" "weak-ssl-ciphers" => "default", "zlib" => "default", "zlib-dynamic" => "default", - "ktls" => "default", ); # Note: => pair form used for aesthetics, not to truly make a hash table @@ -601,7 +622,7 @@ my @disable_cascades = ( "hw" => [ "padlockeng" ], # no-autoalginit is only useful when building non-shared - "autoalginit" => [ "shared", "apps" ], + "autoalginit" => [ "shared", "apps", "fips" ], "stdio" => [ "apps", "capieng", "egd" ], "apps" => [ "tests" ], @@ -617,6 +638,8 @@ my @disable_cascades = ( "cmp" => [ "crmf" ], + "fips" => [ "fips-securitychecks" ], + "deprecated-3.0" => [ "engine", "srp" ] ); @@ -972,6 +995,10 @@ while (@argvcopy) die "FIPS key too long (64 bytes max)\n" if length $1 > 64; } + elsif (/^--banner=(.*)$/) + { + $banner = $1 . "\n"; + } elsif (/^--cross-compile-prefix=(.*)$/) { $user{CROSS_COMPILE}=$1; @@ -1531,22 +1558,32 @@ unless ($disabled{asm}) { # Check for makedepend capabilities. if (!$disabled{makedepend}) { - if ($config{target} =~ /^(VC|vms)-/) { - # For VC- and vms- targets, there's nothing more to do here. The - # functionality is hard coded in the corresponding build files for - # cl (Windows) and CC/DECC (VMS). + # If the attribute makedep_scheme is defined, then we assume that the + # config target and its associated build file are programmed to deal + # with it. + # If makedep_scheme is undefined, we go looking for GCC compatible + # dependency making, and if that's not available, we try to fall back + # on 'makedepend'. + if ($target{makedep_scheme}) { + $config{makedep_scheme} = $target{makedep_scheme}; + # If the makedepcmd attribute is defined, copy it. If not, the + # build files will have to fend for themselves. + $config{makedepcmd} = $target{makedepcmd} if $target{makedepcmd}; } elsif (($predefined_C{__GNUC__} // -1) >= 3 && !($predefined_C{__APPLE_CC__} && !$predefined_C{__clang__})) { # We know that GNU C version 3 and up as well as all clang # versions support dependency generation, but Xcode did not # handle $cc -M before clang support (but claims __GNUC__ = 3) - $config{makedepprog} = "\$(CROSS_COMPILE)$config{CC}"; + $config{makedep_scheme} = 'gcc'; } else { - # In all other cases, we look for 'makedepend', and disable the - # capability if not found. - $config{makedepprog} = which('makedepend'); - disable('unavailable', 'makedepend') unless $config{makedepprog}; + # In all other cases, we look for 'makedepend', and set the + # makedep_scheme value if we found it. + $config{makedepcmd} = which('makedepend'); + $config{makedep_scheme} = 'makedepend' if $config{makedepcmd}; } + + # If no depend scheme is set, we disable makedepend + disable('unavailable', 'makedepend') unless $config{makedep_scheme}; } if (!$disabled{asm} && !$predefined_C{__MACH__} && $^O ne 'VMS') { @@ -2349,16 +2386,16 @@ EOF } foreach (@{$depends{$dest}}) { my $d = cleanfile($sourced, $_, $blddir); + my $d2 = cleanfile($buildd, $_, $blddir); # If we know it's generated, or assume it is because we can't # find it in the source tree, we set file we depend on to be # in the build tree rather than the source tree. if ($d eq $src_configdata - || (grep { $d eq $_ } - map { cleanfile($srcdir, $_, $blddir) } - grep { /\.h$/ } keys %{$unified_info{generate}}) + || (grep { $d2 eq $_ } + keys %{$unified_info{generate}}) || ! -f $d) { - $d = cleanfile($buildd, $_, $blddir); + $d = $d2; } $unified_info{depends}->{$ddest}->{$d} = 1; @@ -2798,23 +2835,7 @@ or position independent code, please let us know (but please first make sure you have tried with a current version of OpenSSL). EOF -print <<"EOF"; - -********************************************************************** -*** *** -*** OpenSSL has been successfully configured *** -*** *** -*** If you encounter a problem while building, please open an *** -*** issue on GitHub *** -*** and include the output from the following command: *** -*** *** -*** perl configdata.pm --dump *** -*** *** -*** (If you are new to OpenSSL, you might want to consult the *** -*** 'Troubleshooting' section in the INSTALL.md file first) *** -*** *** -********************************************************************** -EOF +print $banner; exit(0);