[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  a583fc45fa91a74b944526448621161640579bc2 (commit)
       via  7c55e22c6976d6d19cb6c2340c2f22316546bfca (commit)
      from  4ad386412c03c5c878d0625dedff1c4eb45cd02b (commit)


- Log -----------------------------------------------------------------
commit a583fc45fa91a74b944526448621161640579bc2
Author: Richard Levitte <levitte at openssl.org>
Date:   Tue Feb 16 16:08:06 2016 +0100

    Don't check for gcc or clang on VMS
    
    This check is meaningless on VMS and only produce an error because the
    underlying shell (DCL) doesn't understand sh syntax such as '2>&1'.
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>

commit 7c55e22c6976d6d19cb6c2340c2f22316546bfca
Author: Richard Levitte <levitte at openssl.org>
Date:   Tue Feb 16 16:07:05 2016 +0100

    Lowercase configuration arguments on VMS
    
    Depending on user preferences, Configure might get something like
    --PREFIX=blah just as well as --prefix=blah, or "SHARED" just as well
    as "shared".  On VMS, let's therefore lowercase at least the portion
    of the argument before a possible equal sign.
    
    For good measure, we lowercase the arguments to be checked in
    config.com as well.  The original argument is sent on to Configure,
    however.
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>

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

Summary of changes:
 Configure  | 29 +++++++++++++++++++----------
 config.com | 18 +++++++++---------
 2 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/Configure b/Configure
index 1077371..c2df734 100755
--- a/Configure
+++ b/Configure
@@ -501,6 +501,13 @@ $config{perlargv} = [ @argvcopy ];
 my %unsupported_options = ();
 foreach (@argvcopy)
 	{
+	# VMS is a case insensitive environment, and depending on settings
+	# out of our control, we may receive options uppercased.  Let's
+	# downcase at least the part before any equal sign.
+	if ($^O eq "VMS")
+		{
+		s/^([^=]*)/lc($1)/e;
+		}
 	s /^-no-/no-/; # some people just can't read the instructions
 
 	# rewrite some options in "enable-..." form
@@ -1095,18 +1102,20 @@ if (!$no_asm) {
     }
 }
 
-# Is the compiler gcc or clang?  $ecc is used below to see if error-checking
-# can be turned on.
 my $ecc = $target{cc};
-my $ccpcc = "$config{cross_compile_prefix}$target{cc}";
-$config{makedepprog} = 'makedepend';
-open(PIPE, "$ccpcc --version 2>&1 | head -2 |");
-while ( <PIPE> ) {
-    $config{makedepprog} = $ccpcc if /clang|gcc/;
-    $ecc = "clang" if /clang/;
-    $ecc = "gcc" if /gcc/;
+if ($^O ne "VMS") {
+    # Is the compiler gcc or clang?  $ecc is used below to see if
+    # error-checking can be turned on.
+    my $ccpcc = "$config{cross_compile_prefix}$target{cc}";
+    $config{makedepprog} = 'makedepend';
+    open(PIPE, "$ccpcc --version 2>&1 | head -2 |");
+    while ( <PIPE> ) {
+        $config{makedepprog} = $ccpcc if /clang|gcc/;
+        $ecc = "clang" if /clang/;
+        $ecc = "gcc" if /gcc/;
+    }
+    close(PIPE);
 }
-close(PIPE);
 
 $config{depflags} =~ s/^\s*//;
 
diff --git a/config.com b/config.com
index 1beb74a..b43acfa 100644
--- a/config.com
+++ b/config.com
@@ -17,24 +17,24 @@ $	P_index = 0
 $	LOOP1:
 $	    P_index = P_index + 1
 $	    IF P_index .GT. 8 THEN GOTO ENDLOOP1
-$	    P1 = F$EDIT(P1,"TRIM")
-$	    IF P1 .EQS. "HELP" THEN GOTO USAGE
-$	    IF P1 .EQS. "32"
+$	    P = F$EDIT(P1,"TRIM,LOWERCASE")
+$	    IF P .EQS. "help" THEN GOTO USAGE
+$	    IF P .EQS. "32"
 $	    THEN
 $		pointer_size = "-P32"
-$		P1 = ""
+$		P = ""
 $	    ENDIF
-$	    IF P1 .EQS. "64"
+$	    IF P .EQS. "64"
 $	    THEN
 $		pointer_size = "-P64"
-$		P1 = ""
+$		P = ""
 $	    ENDIF
-$	    IF P1 .EQS. "DEBUG"
+$	    IF P .EQS. "debug"
 $	    THEN
 $		debug = "--debug"
-$		P1 = ""
+$		P = ""
 $	    ENDIF
-$	    IF P1 .NES. "" THEN -
+$	    IF P .NES. "" THEN -
 	       collected_args = collected_args + " " + P1
 $	    P1 = P2
 $	    P2 = P3