branch master updated: * tp/Texinfo/XSLoader.pm (init): add an argument for @DynaLoader::dl_resolve_using additional libraries.

[Patrice Dumas]

This is an automated email from the git hooks/post-receive script.

pertusus pushed a commit to branch master
in repository texinfo.

The following commit(s) were added to refs/heads/master by this push:
     new 75cdf16485 * tp/Texinfo/XSLoader.pm (init): add an argument for 
@DynaLoader::dl_resolve_using additional libraries.
75cdf16485 is described below

commit 75cdf164851f3b259097688621a4a4e279595b49
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sun Nov 17 23:58:35 2024 +0100

    * tp/Texinfo/XSLoader.pm (init): add an argument for
    @DynaLoader::dl_resolve_using additional libraries.
    
    * tp/Texinfo/DocumentXS.pm (BEGIN), tp/Texinfo/Parser.pm (BEGIN): add
    -ltexinfoxs and -ltexinfo as additional libraries.
---
 ChangeLog                | 8 ++++++++
 tp/Texinfo/DocumentXS.pm | 1 +
 tp/Texinfo/Parser.pm     | 1 +
 tp/Texinfo/XSLoader.pm   | 7 +++++++
 4 files changed, 17 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 8d817ca482..dc017b39ae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2024-11-17  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Texinfo/XSLoader.pm (init): add an argument for
+       @DynaLoader::dl_resolve_using additional libraries.
+
+       * tp/Texinfo/DocumentXS.pm (BEGIN), tp/Texinfo/Parser.pm (BEGIN): add
+       -ltexinfoxs and -ltexinfo as additional libraries.
+
 2024-11-17  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/XSLoader.pm (init): follow the DynaLoader documentation
diff --git a/tp/Texinfo/DocumentXS.pm b/tp/Texinfo/DocumentXS.pm
index bc78653275..332a07e592 100644
--- a/tp/Texinfo/DocumentXS.pm
+++ b/tp/Texinfo/DocumentXS.pm
@@ -30,6 +30,7 @@ BEGIN {
       undef,
       "DocumentXS",
       undef,
+      ['-ltexinfoxs', '-ltexinfo'],
   );
 }
 
diff --git a/tp/Texinfo/Parser.pm b/tp/Texinfo/Parser.pm
index e47ffe1972..d87901951f 100644
--- a/tp/Texinfo/Parser.pm
+++ b/tp/Texinfo/Parser.pm
@@ -34,6 +34,7 @@ BEGIN {
       "Texinfo::ParserNonXS",
       $shared_library_name,
       "Texinfo::XS::parsetexi::Parsetexi",
+      ['-ltexinfoxs', '-ltexinfo'],
   );
 }
 
diff --git a/tp/Texinfo/XSLoader.pm b/tp/Texinfo/XSLoader.pm
index 8010f03b83..6cfea1e399 100644
--- a/tp/Texinfo/XSLoader.pm
+++ b/tp/Texinfo/XSLoader.pm
@@ -108,6 +108,7 @@ sub init {
      $fallback_module,
      $module_name,
      $perl_extra_file,
+     $additional_libraries,
    ) = @_;
 
   # Possible values for TEXINFO_XS environment variable:
@@ -177,6 +178,12 @@ sub init {
   }
   my $dlpath = $found_files[0];
 
+  if ($additional_libraries and scalar(@$additional_libraries)) {
+    my @found_additional_libraries
+      = DynaLoader::dl_findfile(@$additional_libraries);
+    push @DynaLoader::dl_resolve_using, @found_additional_libraries;
+  }
+
   #my $flags = dl_load_flags $module; # This is 0 in DynaLoader
   my $flags = 0;
   my $libref = DynaLoader::dl_load_file($dlpath, $flags);