[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  8e8b883f6b51a88360368724fd6a96a363eaa92a (commit)
      from  3a4e9367d83a43f0d1c5b5eab4396c4b05df1a6b (commit)


- Log -----------------------------------------------------------------
commit 8e8b883f6b51a88360368724fd6a96a363eaa92a
Author: Richard Levitte <levitte at openssl.org>
Date:   Thu Jan 14 17:03:58 2016 +0100

    Relax the requirements for a debug build
    
    We required that a target be named 'debug-something' or to have at
    least one of the configuration items debug_cflags and debug_lflags for
    --debug to be accepted.
    
    However, there are targets with no such markings but that will still
    have debugging capabilities.  This is particularly true for mk1mf
    builds, where the extra flags for debugging are figured out later on
    by util/mk1mf.pl.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

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

Summary of changes:
 Configure | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/Configure b/Configure
index 4867475..c309485 100755
--- a/Configure
+++ b/Configure
@@ -1268,22 +1268,17 @@ print "Configuring for $target\n";
 my ($d, $t) = $target =~ m/^(debug-)?(.*)$/;
 if ($d) {
     $build_prefix = "debug_";
+    $target = $t;
 
     # If we do not find debug-foo in the table, the target is set to foo,
     # but only if the foo target has a noon-empty debug_cflags or debug_lflags
     # attribute.
-    if (!$table{$target} && ($table{$t}->{debug_cflags}
-			     || $table{$t}->{debug_lflags})) {
+    if (!$table{$target}) {
 	$target = $t;
     }
 }
 
-&usage if (!defined($table{$target})
-	   || $table{$target}->{template}
-	   || ($build_prefix eq "debug_"
-	       && $target !~ /^debug-/
-	       && !($table{$target}->{debug_cflags}
-		    || $table{$target}->{debug_lflags})));
+&usage if (!defined($table{$target}) || $table{$target}->{template});
 
 if ($fips)
 	{