[openssl] master update

[Richard Levitte]

The branch master has been updated
       via  0c4e984de28b1477e002766b2751576f5c6c47d6 (commit)
       via  a583172dac8bce37e268943e570968f193e8b64b (commit)
      from  e8fb288cc5057bb198a7f1c6e46f3b64b5d7a476 (commit)


- Log -----------------------------------------------------------------
commit 0c4e984de28b1477e002766b2751576f5c6c47d6
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)

commit a583172dac8bce37e268943e570968f193e8b64b
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)

-----------------------------------------------------------------------

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 a1daf7d..de59794 100644
--- a/Configurations/windows-makefile.tmpl
+++ b/Configurations/windows-makefile.tmpl
@@ -206,6 +206,7 @@ AS={- $config{AS} -}
 ASFLAGS={- join(' ', @{$config{ASFLAGS}}) -}
 
 RC={- $config{RC} -}
+RCFLAGS={- join(' ', @{$config{RCFLAGS}}) -}
 
 ECHO="$(PERL)" "$(SRCDIR)\util\echo.pl"
 
@@ -630,7 +631,7 @@ EOF
          my $res = platform->res($args{obj});
          return <<"EOF";
 $res: $deps
-	\$(RC) \$(RCOUTFLAG)\$\@ $srcs
+	\$(RC) \$(RCFLAGS) \$(RCOUTFLAG)\$\@ $srcs
 EOF
      }
      my $obj = platform->obj($args{obj});
diff --git a/Configure b/Configure
index 480837c..701368d 100755
--- a/Configure
+++ b/Configure
@@ -594,7 +594,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
@@ -611,6 +611,7 @@ my %useradd = (
     CXXFLAGS    => [],
     LDFLAGS     => [],
     LDLIBS      => [],
+    RCFLAGS     => [],
    );
 
 my %user_synonyms = (