[openssl-commits] [openssl] OpenSSL_1_0_2-stable update

[Richard Levitte]

The branch OpenSSL_1_0_2-stable has been updated
       via  3cb28d188803c7768f767f0da40bbea61449521c (commit)
      from  01f879d3e3fe5bdcf290b802a3c44a2bdde2b059 (commit)


- Log -----------------------------------------------------------------
commit 3cb28d188803c7768f767f0da40bbea61449521c
Author: Richard Levitte <levitte at openssl.org>
Date:   Fri Aug 19 16:53:54 2016 +0200

    mk1mf: dtlstest needs ssltestlib, include it with a hack
    
    We don't really have a mechanism to include other object files into a given
    test program.  For now, a simple hack in mk1mf.pl will do.
    
    RT#4653
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

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

Summary of changes:
 util/mk1mf.pl | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/util/mk1mf.pl b/util/mk1mf.pl
index 128a405..4eded5a 100755
--- a/util/mk1mf.pl
+++ b/util/mk1mf.pl
@@ -692,8 +692,8 @@ $rules.=&do_copy_rule("\$(INCL_D)",$header,"");
 $defs.=&do_defs("EXHEADER",$exheader,"\$(INCO_D)","");
 $rules.=&do_copy_rule("\$(INCO_D)",$exheader,"");
 
-$defs.=&do_defs("T_OBJ",$test,"\$(OBJ_D)",$obj);
-$rules.=&do_compile_rule("\$(OBJ_D)",$test,"\$(APP_CFLAGS)");
+$defs.=&do_defs("T_OBJ","$test test${o}ssltestlib","\$(OBJ_D)",$obj);
+$rules.=&do_compile_rule("\$(OBJ_D)","$test test${o}ssltestlib","\$(APP_CFLAGS)");
 
 $defs.=&do_defs("E_OBJ",$e_exe,"\$(OBJ_D)",$obj);
 $rules.=&do_compile_rule("\$(OBJ_D)",$e_exe,'-DMONOLITH $(APP_CFLAGS)');
@@ -764,6 +764,7 @@ foreach (split(/\s+/,$test))
 	{
 	$t=&bname($_);
 	$tt="\$(OBJ_D)${o}$t${obj}";
+	$tt.=" \$(OBJ_D)${o}ssltestlib${obj}" if $t eq "dtlstest";
 	$rules.=&do_link_rule("\$(TEST_D)$o$t$exep",$tt,"\$(LIBS_DEP)","\$(L_LIBS) \$(EX_LIBS)");
 	}