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 b3484e198597837afe112b56d61937851b4953af..2e2eaa6dcd42a78a76163d1a3a7a6aa19b34101b 100644 (file)
--- 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($_) }
   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
   "" -}
 $       ! 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 f9ae76b47be999989873829ef94b098f925e924c..feade87ef8a5127ac28b78ff45f6e937ec290bb1 100644 (file)
--- 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($_) }
   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
 $
   "" -}
 $       ! Remove the local environment created by local_shlib.com
 $