[openssl] OpenSSL_1_1_1-stable update
Richard Levitte
levitte at openssl.org
Thu May 2 09:17:36 UTC 2019
The branch OpenSSL_1_1_1-stable has been updated
via 68b8769e4e16e69954729d27a0d40b93f1098a8a (commit)
via 1e8ae82e2cc25e9a4d877d387e06796c829e4694 (commit)
from 7216e9a20aee620d85185a6ddb8caa30f11f2192 (commit)
- Log -----------------------------------------------------------------
commit 68b8769e4e16e69954729d27a0d40b93f1098a8a
Author: Wojciech Kaluza <w-kaluza at tlen.pl>
Date: Sun Apr 21 12:39:20 2019 +0100
Allow setting RCFLAGS as Configure option or environment variable
Reviewed-by: Tim Hudson <tjh at openssl.org>
Reviewed-by: Richard Levitte <levitte at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/8803)
(cherry picked from commit 0c4e984de28b1477e002766b2751576f5c6c47d6)
commit 1e8ae82e2cc25e9a4d877d387e06796c829e4694
Author: Wojciech Kaluza <w-kaluza at tlen.pl>
Date: Sun Apr 21 12:14:34 2019 +0100
Add RCFLAGS variable in Windows build file, and use it
- Allow user-defined RCFLAGS
- Pass RCFLAGS to RC
Reviewed-by: Tim Hudson <tjh at openssl.org>
Reviewed-by: Richard Levitte <levitte at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/8803)
(cherry picked from commit a583172dac8bce37e268943e570968f193e8b64b)
-----------------------------------------------------------------------
Summary of changes:
Configurations/windows-makefile.tmpl | 3 ++-
Configure | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl
index d420bff..8ef70b8 100644
--- a/Configurations/windows-makefile.tmpl
+++ b/Configurations/windows-makefile.tmpl
@@ -187,6 +187,7 @@ AS={- $config{AS} -}
ASFLAGS={- join(' ', @{$config{ASFLAGS}}) -}
RC={- $config{RC} -}
+RCFLAGS={- join(' ', @{$config{RCFLAGS}}) -}
ECHO="$(PERL)" "$(SRCDIR)\util\echo.pl"
@@ -586,7 +587,7 @@ EOF
if ($srcs[0] =~ /\.rc$/) {
return <<"EOF";
$args{obj}: $deps
- \$(RC) \$(RCOUTFLAG)\$\@ $srcs
+ \$(RC) \$(RCFLAGS) \$(RCOUTFLAG)\$\@ $srcs
EOF
}
(my $obj = $args{obj}) =~ s|\.o$||;
diff --git a/Configure b/Configure
index 9796084..85418b3 100755
--- a/Configure
+++ b/Configure
@@ -562,7 +562,7 @@ my %user = (
PERL => env('PERL') || ($^O ne "VMS" ? $^X : "perl"),
RANLIB => env('RANLIB'),
RC => env('RC') || env('WINDRES'),
- RCFLAGS => [],
+ RCFLAGS => [ env('RCFLAGS') || () ],
RM => undef,
);
# Info about what "make variables" may be prefixed with the cross compiler
@@ -579,6 +579,7 @@ my %useradd = (
CXXFLAGS => [],
LDFLAGS => [],
LDLIBS => [],
+ RCFLAGS => [],
);
my %user_synonyms = (
More information about the openssl-commits
mailing list