[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  707c19f42113f90405b67cde59e5f1c1e42e6ab2 (commit)
       via  04375857cf4971460c473fa44bef86351f2177fe (commit)
      from  9f15e5b911ba6053e09578f190354568e01c07d7 (commit)


- Log -----------------------------------------------------------------
commit 707c19f42113f90405b67cde59e5f1c1e42e6ab2
Author: Richard Levitte <levitte at openssl.org>
Date:   Sat Nov 24 17:39:56 2018 +0100

    VMS build: typo in build file template, generatesrc
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/7700)

commit 04375857cf4971460c473fa44bef86351f2177fe
Author: Richard Levitte <levitte at openssl.org>
Date:   Sat Nov 24 11:37:10 2018 +0100

    VMS config: Typo fix, as -> AS
    
    This typo prevented ia64 assembler to be compiled on VMS
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/7700)

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

Summary of changes:
 Configurations/10-main.conf     | 2 +-
 Configurations/descrip.mms.tmpl | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
index e3cc34c..d86691c 100644
--- a/Configurations/10-main.conf
+++ b/Configurations/10-main.conf
@@ -1791,7 +1791,7 @@ my %targets = (
     },
     "vms-ia64" => {
         inherit_from     => [ "vms-generic",
-                              sub { vms_info()->{as}
+                              sub { vms_info()->{AS}
                                         ? asm("ia64_asm")->() : () } ],
         bn_ops           => "SIXTY_FOUR_BIT RC4_INT",
         pointer_size     => "",
diff --git a/Configurations/descrip.mms.tmpl b/Configurations/descrip.mms.tmpl
index 71660b3..d06c699 100644
--- a/Configurations/descrip.mms.tmpl
+++ b/Configurations/descrip.mms.tmpl
@@ -766,7 +766,7 @@ reconfigure reconf :
 $target : $args{generator}->[0] $deps $mkdef
 	\$(PERL) $mkdef$ord_ver --ordinals $args{generator}->[0] --name $ord_name "--OS" "VMS"$case_insensitive > $target
 EOF
-      } elsif ($target !~ /\.[sS]$/) {
+      } elsif ($args{src} !~ /\.[sS]$/) {
           my $target = $args{src};
           if ($args{generator}->[0] =~ m|^.*\.in$|) {
 	      my $dofile = abs2rel(rel2abs(catfile($config{sourcedir},