From: Richard Levitte <levitte@openssl.org>
Date: Thu, 2 Feb 2023 16:51:26 +0000 (+0100)
Subject: Fix more VMS inclusions
X-Git-Tag: openssl-3.2.0-alpha1~1318
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ae08ed08e49b945d516294106fa185bb136669b2;p=thirdparty%2Fopenssl.git

Fix more VMS inclusions

inclusing quic/quic_local.h from ssl/ssl_lib.c presented another challenge
for the current VMS C.  Since ssl/quic/quic_local.h in turn includes
../ssl_local.h, we compensated for with the usual whack-a-mole in
Configurations/descrip.mms.tmpl.

As far as my personal tests go, this seems to be the last fix of this sort,
so far.

Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/20196)
---

diff --git a/Configurations/descrip.mms.tmpl b/Configurations/descrip.mms.tmpl
index 85a3c778b7d..57834630b9f 100644
--- a/Configurations/descrip.mms.tmpl
+++ b/Configurations/descrip.mms.tmpl
@@ -229,12 +229,18 @@
   }
   foreach (grep /\[\.ssl\].*?\.o$/, keys %{$unified_info{sources}}) {
       my $obj = platform->obj($_);
-      # Most of the files in [.ssl.record.methods] include "ssl_local.h"
-      # which includes things like "record/record.h".  Adding "./" as an
-      # inclusion directory helps making this sort of header from these
-      # directories.
+      # Most of the files in [.ssl] include "ssl_local.h" which includes things
+      # like "record/record.h".  Adding "./" as an inclusion directory helps
+      # making this sort of header from these directories.
       push @{$unified_info{includes_extra}->{$obj}}, qw(./);
   }
+  foreach (grep /\[\.ssl\].*?ssl_lib\.o$/, keys %{$unified_info{sources}}) {
+      my $obj = platform->obj($_);
+      # Some files in [.ssl] include "quic/quic_local.h", which in turn
+      # includes "../ssl_local.h".  Adding "./quic" as an inclusion directory
+      # helps making this sort of header from these directories.
+      push @{$unified_info{includes_extra}->{$obj}}, qw(./quic);
+  }
   foreach (grep /\[\.ssl\.(?:record|statem)\].*?\.o$/, keys %{$unified_info{sources}}) {
       my $obj = platform->obj($_);
       # Most of the files in [.ssl.record] and [.ssl.statem] include