[openssl] master update

[Richard Levitte]

The branch master has been updated
       via  ff825807bc9bda996058df070f8ec23f7167e1a6 (commit)
      from  ce506d27ab5e7d17dfe3fe649768a0d19b6c86ee (commit)


- Log -----------------------------------------------------------------
commit ff825807bc9bda996058df070f8ec23f7167e1a6
Author: Richard Levitte <levitte at openssl.org>
Date:   Fri Mar 1 14:15:13 2019 +0100

    VMS: fix util/[un]local.com.in to handle attributes
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/8382)

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

Summary of changes:
 util/local_shlib.com.in   | 6 +++++-
 util/unlocal_shlib.com.in | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/util/local_shlib.com.in b/util/local_shlib.com.in
index b3484e1..2e2eaa6 100644
--- a/util/local_shlib.com.in
+++ b/util/local_shlib.com.in
@@ -1,7 +1,11 @@
 ${-
+  use File::Spec::Functions qw(rel2abs);
+
+  my $bldtop = rel2abs($config{builddir});
   our %names = ( map { platform->sharedname($_) =>
                            $bldtop.platform->sharedlib($_) }
-                 @{$unified_info{install}->{libraries}} );
+                 grep { !$unified_info{attributes}->{$_}->{noinst} }
+                 @{$unified_info{libraries}} );
   "" -}
 $       ! Create a local environment with the shared library logical names
 $       ! properly set.  Undo this with unlocal_shlib.com
diff --git a/util/unlocal_shlib.com.in b/util/unlocal_shlib.com.in
index f9ae76b..feade87 100644
--- a/util/unlocal_shlib.com.in
+++ b/util/unlocal_shlib.com.in
@@ -1,7 +1,11 @@
 ${-
+  use File::Spec::Functions qw(rel2abs);
+
+  my $bldtop = rel2abs($config{builddir});
   our %names = ( map { platform->sharedname($_) =>
                            $bldtop.platform->sharedlib($_) }
-                 @{$unified_info{install}->{libraries}} );
+                 grep { !$unified_info{attributes}->{$_}->{noinst} }
+                 @{$unified_info{libraries}} );
   "" -}
 $       ! Remove the local environment created by local_shlib.com
 $