openssl
/
openssl
mirror of https://github.com/openssl/openssl
1
0
Fork 0
Code Issues Releases Wiki Activity

Replace CONFIG_NOWAIT env var with -w option 

And document the -w option

Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/16325)
This commit is contained in:
Rich Salz 2021-08-17 11:42:21 -04:00 committed by Pauli
parent 214888448d
commit ecb09bafad
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Configure
View File

@ -63,6 +63,8 @@ EOF
# (Default: PREFIX/ssl) # (Default: PREFIX/ssl)
# --banner=".." Output specified text instead of default completion banner # --banner=".." Output specified text instead of default completion banner
# #
# -w Don't wait after showing a Configure warning
#
# --cross-compile-prefix Add specified prefix to binutils components. # --cross-compile-prefix Add specified prefix to binutils components.
# #
# --api One of 0.9.8, 1.0.0, 1.0.1, 1.0.2, 1.1.0, 1.1.1, or 3.0 # --api One of 0.9.8, 1.0.0, 1.0.1, 1.0.2, 1.1.0, 1.1.1, or 3.0
@ -898,7 +900,7 @@ while (@argvcopy)
{ {
$guess_opts{verbose} = 1; $guess_opts{verbose} = 1;
} }
elsif (/^-w$/) # From older 'config' elsif (/^-w$/)
{ {
$guess_opts{nowait} = 1; $guess_opts{nowait} = 1;
} }

13
INSTALL.md
View File

@ -587,6 +587,13 @@ alternative, you can use the language specific variables, `CFLAGS` and `CXXFLAGS
Use the specified text instead of the default banner at the end of Use the specified text instead of the default banner at the end of
configuration. configuration.
### --w
On platforms where the choice of 32-bit or 64-bit architecture
is not explicitly specified, `Configure` will print a warning
message and wait for a few seconds to let you interrupt the
configuration. Using this flag skips the wait.
### no-bulk ### no-bulk
Build only some minimal set of features. Build only some minimal set of features.
@ -1404,12 +1411,6 @@ over the build process. Typically these should be defined prior to running
using this variable. Set it to the compiler executable you wish using this variable. Set it to the compiler executable you wish
to use, e.g. gcc or clang. to use, e.g. gcc or clang.
CONFIG_NOWAIT
On platforms where the choice of 32-bit or 64-bit architecture
is not explicitly specified, `Configure` will print a warning
message and wait for a few seconds to let you interrupt the
configuration. Setting this variable will skip the wait.
CROSS_COMPILE CROSS_COMPILE
This environment variable has the same meaning as for the This environment variable has the same meaning as for the
"--cross-compile-prefix" Configure flag described above. If both "--cross-compile-prefix" Configure flag described above. If both

2
util/perl/OpenSSL/config.pm
View File

@ -22,8 +22,8 @@ use Carp;
# These control our behavior. # These control our behavior.
my $DRYRUN; my $DRYRUN;
my $VERBOSE; my $VERBOSE;
my $WAIT = defined $ENV{'CONFIG_NOWAIT'} ? 0 : 1;
my $WHERE = dirname($0); my $WHERE = dirname($0);
my $WAIT = 1;
# Machine type, etc., used to determine the platform # Machine type, etc., used to determine the platform
my $MACHINE; my $MACHINE;