From 5c3dbd2eacc879a890b6ff15b587a87fc3363b05 Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Fri, 4 Nov 2016 14:08:55 +0100 Subject: [PATCH] VMS: update the list of files that need some extra treatment This is related to a lack in path merging involding includes of includes Reviewed-by: Rich Salz (Merged from https://github.com/openssl/openssl/pull/1846) --- Configurations/descrip.mms.tmpl | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/Configurations/descrip.mms.tmpl b/Configurations/descrip.mms.tmpl index b3e2cc4948..2c58078b35 100644 --- a/Configurations/descrip.mms.tmpl +++ b/Configurations/descrip.mms.tmpl @@ -63,17 +63,13 @@ } my $sd1 = sourcedir("ssl","record"); my $sd2 = sourcedir("ssl","statem"); - $unified_info{before}->{"[.test]heartbeat_test.OBJ"} - = $unified_info{before}->{"[.test]ssltest_old.OBJ"} - = qq(record_include = F\$PARSE("$sd1","A.;",,,"SYNTAX_ONLY") - "A.;" - define record 'record_include' - statem_include = F\$PARSE("$sd2","A.;",,,"SYNTAX_ONLY") - "A.;" - define statem 'statem_include'); - $unified_info{after}->{"[.test]heartbeat_test.OBJ"} - = $unified_info{after}->{"[.test]ssltest.OBJ"} - = qq(deassign statem - deassign record); - foreach (grep /^\[\.ssl\.(?:record|statem)\].*\.o$/, keys %{$unified_info{sources}}) { + my @ssl_locl_users = + ( "[.test]cipher_overhead_test.o", + "[.test]dtls_mtu_test.o", + "[.test]heartbeat_test.o", + "[.test]ssltest_old.o", + grep /^\[\.ssl\.(?:record|statem)\].*\.o$/, keys %{$unified_info{sources}} ); + foreach (@ssl_locl_users) { (my $x = $_) =~ s|\.o$|.OBJ|; $unified_info{before}->{$x} = qq(record_include = F\$PARSE("$sd1","A.;",,,"SYNTAX_ONLY") - "A.;" -- 2.25.1