[openssl] master update
Dr. Paul Dale
pauli at openssl.org
Fri Aug 20 00:33:18 UTC 2021
The branch master has been updated
via ecb09bafad43bc8a722c498f859ed6ad3c73b99b (commit)
via 214888448df407e2154ca871d6ffec41ab18698e (commit)
via 92115096c31bf5d2ddd3263a21d2cb86b3dbfe3f (commit)
from 023cb594d951569afc1e32dd8fc18df85a4f8349 (commit)
- Log -----------------------------------------------------------------
commit ecb09bafad43bc8a722c498f859ed6ad3c73b99b
Author: Rich Salz <rsalz at akamai.com>
Date: Tue Aug 17 11:42:21 2021 -0400
Replace CONFIG_NOWAIT env var with -w option
And document the -w option
Reviewed-by: Richard Levitte <levitte at openssl.org>
Reviewed-by: Paul Dale <pauli at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/16325)
commit 214888448df407e2154ca871d6ffec41ab18698e
Author: Rich Salz <rsalz at akamai.com>
Date: Mon Aug 16 16:29:09 2021 -0400
Set KERNEL_BITS, add CONFIG_NOWAIT
Avoid perl "undefined variable in regexp" message.
Not all uses were changed because I wasn't sure.
Add support for CONFIG_NOWAIT environment variable.
Reviewed-by: Richard Levitte <levitte at openssl.org>
Reviewed-by: Paul Dale <pauli at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/16325)
commit 92115096c31bf5d2ddd3263a21d2cb86b3dbfe3f
Author: Rich Salz <rsalz at akamai.com>
Date: Mon Aug 16 16:25:03 2021 -0400
Minor doc enhancements to INSTALL.md
Describe current relationship between config and Configure.
Put the environment variable list in alphabetical order.
Add description of KERNEL_BITS.
Add new variable CONFIG_NOWAIT.
Reviewed-by: Richard Levitte <levitte at openssl.org>
Reviewed-by: Paul Dale <pauli at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/16325)
-----------------------------------------------------------------------
Summary of changes:
Configure | 4 +++-
INSTALL.md | 38 ++++++++++++++++++++++++--------------
util/perl/OpenSSL/config.pm | 10 +++++-----
3 files changed, 32 insertions(+), 20 deletions(-)
diff --git a/Configure b/Configure
index 2264e090c5..b00b91ac63 100755
--- a/Configure
+++ b/Configure
@@ -63,6 +63,8 @@ EOF
# (Default: PREFIX/ssl)
# --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.
#
# --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;
}
- elsif (/^-w$/) # From older 'config'
+ elsif (/^-w$/)
{
$guess_opts{nowait} = 1;
}
diff --git a/INSTALL.md b/INSTALL.md
index c717dfcdf0..722a88bf04 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -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
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
Build only some minimal set of features.
@@ -1142,11 +1149,9 @@ Configure OpenSSL
### Automatic Configuration
-On some platform a `config` script is available which attempts to guess
-your operating system (and compiler, if necessary) and calls the `Configure`
-Perl script with appropriate target based on its guess. Further options can
-be supplied to the `config` script, which will be passed on to the `Configure`
-script.
+In previous version, the `config` script determined the platform type and
+compiler and then called `Configure`. Starting with this release, they are
+the same.
#### Unix / Linux / macOS
@@ -1411,6 +1416,18 @@ over the build process. Typically these should be defined prior to running
"--cross-compile-prefix" Configure flag described above. If both
are set then the Configure flag takes precedence.
+ HASHBANGPERL
+ The command string for the Perl executable to insert in the
+ #! line of perl scripts that will be publicly installed.
+ Default: /usr/bin/env perl
+ Note: the value of this variable is added to the same scripts
+ on all platforms, but it's only relevant on Unix-like platforms.
+
+ KERNEL_BITS
+ This can be the value `32` or `64` to specify the architecture
+ when it is not "obvious" to the configuration. It should generally
+ not be necessary to specify this environment variable.
+
NM
The name of the nm executable to use.
@@ -1435,12 +1452,8 @@ over the build process. Typically these should be defined prior to running
Only needed if builing should use a different Perl executable
than what is used to run the Configure script.
- HASHBANGPERL
- The command string for the Perl executable to insert in the
- #! line of perl scripts that will be publicly installed.
- Default: /usr/bin/env perl
- Note: the value of this variable is added to the same scripts
- on all platforms, but it's only relevant on Unix-like platforms.
+ RANLIB
+ The name of the ranlib executable to use.
RC
The name of the rc executable to use. The default will be as
@@ -1449,9 +1462,6 @@ over the build process. Typically these should be defined prior to running
variable is synonymous to this. If both are defined then RC
takes precedence.
- RANLIB
- The name of the ranlib executable to use.
-
WINDRES
See RC.
diff --git a/util/perl/OpenSSL/config.pm b/util/perl/OpenSSL/config.pm
index 5f549f8024..7250791b5b 100755
--- a/util/perl/OpenSSL/config.pm
+++ b/util/perl/OpenSSL/config.pm
@@ -22,8 +22,8 @@ use Carp;
# These control our behavior.
my $DRYRUN;
my $VERBOSE;
-my $WAIT = 1;
my $WHERE = dirname($0);
+my $WAIT = 1;
# Machine type, etc., used to determine the platform
my $MACHINE;
@@ -452,7 +452,7 @@ EOF
[ 'ppc-apple-rhapsody', { target => "rhapsody-ppc" } ],
[ 'ppc-apple-darwin.*',
sub {
- my $KERNEL_BITS = $ENV{KERNEL_BITS};
+ my $KERNEL_BITS = $ENV{KERNEL_BITS} // '';
my $ISA64 = `sysctl -n hw.optional.64bitops 2>/dev/null`;
if ( $ISA64 == 1 && $KERNEL_BITS eq '' ) {
print <<EOF;
@@ -468,7 +468,7 @@ EOF
],
[ 'i.86-apple-darwin.*',
sub {
- my $KERNEL_BITS = $ENV{KERNEL_BITS};
+ my $KERNEL_BITS = $ENV{KERNEL_BITS} // '';
my $ISA64 = `sysctl -n hw.optional.x86_64 2>/dev/null`;
if ( $ISA64 == 1 && $KERNEL_BITS eq '' ) {
print <<EOF;
@@ -484,7 +484,7 @@ EOF
],
[ 'x86_64-apple-darwin.*',
sub {
- my $KERNEL_BITS = $ENV{KERNEL_BITS};
+ my $KERNEL_BITS = $ENV{KERNEL_BITS} // '';
return { target => "darwin-i386" } if $KERNEL_BITS eq '32';
print <<EOF;
@@ -532,7 +532,7 @@ EOF
],
[ 'ppc64-.*-linux2',
sub {
- my $KERNEL_BITS = $ENV{KERNEL_BITS};
+ my $KERNEL_BITS = $ENV{KERNEL_BITS} // '';
if ( $KERNEL_BITS eq '' ) {
print <<EOF;
WARNING! To build 64-bit package, do this:
More information about the openssl-commits
mailing list