From: Richard Levitte <levitte@openssl.org>
Date: Fri, 1 Mar 2019 13:15:13 +0000 (+0100)
Subject: VMS: fix util/[un]local.com.in to handle attributes
X-Git-Tag: openssl-3.0.0-alpha1~2447
X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=commitdiff_plain;h=ff825807bc9bda996058df070f8ec23f7167e1a6

VMS: fix util/[un]local.com.in to handle attributes

Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/8382)
---

diff --git a/util/local_shlib.com.in b/util/local_shlib.com.in
index b3484e1985..2e2eaa6dcd 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 f9ae76b47b..feade87ef8 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
 $