(openoffice) 02/02: deliver.pl: recognize macOS libfoo.N.dylib naming in linklib:

[jim]

This is an automated email from the ASF dual-hosted git repository.

jimjag pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git

commit f785e54011620d20456b46e8626fcddbbcb04f6d
Author: Jim Jagielski <jim...@gmail.com>
AuthorDate: Thu Aug 6 14:17:29 2026 -0400

    deliver.pl: recognize macOS libfoo.N.dylib naming in linklib:
    
    (cherry picked from commit e28c1c5c7ee9fb9b5b500b5f72d96e08df8962b7)
---
 main/solenv/bin/deliver.pl | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/main/solenv/bin/deliver.pl b/main/solenv/bin/deliver.pl
index c798ee3a03..e950d71d82 100755
--- a/main/solenv/bin/deliver.pl
+++ b/main/solenv/bin/deliver.pl
@@ -249,6 +249,12 @@ sub do_linklib
         {
            push(@{$globbed_hash{$1}}, $lib);
         }
+        # libtool's macOS naming puts the version before the extension
+        # (libfoo.4.dylib), unlike ELF's libfoo.so.4 -- same file, opposite 
order.
+        elsif ( $lib =~ /^(lib\S+)\.(\d+)(\.\d+)?(\.\d+)?(\.dylib)$/ )
+        {
+           push(@{$globbed_hash{"$1$5"}}, $lib);
+        }
         else {
             print_warning("invalid library name: $lib");
         }
@@ -262,6 +268,12 @@ sub do_linklib
             $lib_major = "$lib_base.$3";
             $long = 1;
         }
+        elsif ( $lib =~ /^(lib\S+)\.(\d+)(\.\d+)?(\.\d+)?(\.dylib)$/ )
+        {
+            # macOS dylibs don't carry a separate major-only symlink; the
+            # single unversioned name below is enough.
+            $long = 0;
+        }
         else
         {
             # $lib =~ /^(lib[\w-]+(\.so|\.dylib))\.(\d+)$/;