[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  c47188499631a0ff07740853d60f2196a147eed9 (commit)
      from  67336ea4006e83d0c90821c02b7f94bb80c24647 (commit)


- Log -----------------------------------------------------------------
commit c47188499631a0ff07740853d60f2196a147eed9
Author: Richard Levitte <levitte at openssl.org>
Date:   Wed Mar 9 17:18:07 2016 +0100

    Comment away the extra checks in Configure
    
    The "extra checks" is a debugging tool to check the config resolving
    mechanism.  It uses Perl's smart match, which is experimental and
    therefore always causes Perl to give out a warning, and it causes
    older Perl versions to fail entirely.
    
    So, it gets commented away, but stays otherwise in place, as it may be
    useful again.
    
    Reviewed-by: Matt Caswell <matt at openssl.org>

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

Summary of changes:
 Configure | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Configure b/Configure
index 57d8a5a..eb7e54c 100755
--- a/Configure
+++ b/Configure
@@ -2058,7 +2058,7 @@ sub resolve_config {
     my $target = shift;
     my @breadcrumbs = @_;
 
-    my $extra_checks = defined($ENV{CONFIGURE_EXTRA_CHECKS});
+#    my $extra_checks = defined($ENV{CONFIGURE_EXTRA_CHECKS});
 
     if (grep { $_ eq $target } @breadcrumbs) {
 	die "inherit_from loop!  target backtrace:\n  "
@@ -2158,10 +2158,10 @@ sub resolve_config {
         unless(defined($table{$target}->{$_})) {
             delete $table{$target}->{$_};
         }
-        if ($extra_checks &&
-            $previous && !($add_called ||  $previous ~~ $table{$target}->{$_})) {
-            warn "$_ got replaced in $target\n";
-        }
+#        if ($extra_checks &&
+#            $previous && !($add_called ||  $previous ~~ $table{$target}->{$_})) {
+#            warn "$_ got replaced in $target\n";
+#        }
     }
 
     # Finally done, return the result.