branch master updated: * tp/Texinfo/XSLoader.pm (init), tp/Texinfo/DocumentXS.pm (BEGIN), tp/Texinfo/Parser.pm (BEGIN): do not try to add libraries to @DynaLoader::dl_resolve_using, in general they are not used when loading XS object, only the paths registered in the objects are used.

[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 803fb8345a * tp/Texinfo/XSLoader.pm (init), tp/Texinfo/DocumentXS.pm 
(BEGIN), tp/Texinfo/Parser.pm (BEGIN): do not try to add libraries to 
@DynaLoader::dl_resolve_using, in general they are not used when loading XS 
object, only the paths registered in the objects are used.
803fb8345a is described below

commit 803fb8345a72c828d1fdae5dc71662457260bb12
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Wed Nov 20 11:48:39 2024 +0100

    * tp/Texinfo/XSLoader.pm (init), tp/Texinfo/DocumentXS.pm (BEGIN),
    tp/Texinfo/Parser.pm (BEGIN): do not try to add libraries to
    @DynaLoader::dl_resolve_using, in general they are not used when
    loading XS object, only the paths registered in the objects are used.
---
 ChangeLog                |  7 +++++++
 tp/Texinfo/DocumentXS.pm |  1 -
 tp/Texinfo/Parser.pm     |  1 -
 tp/Texinfo/XSLoader.pm   | 20 ++++++++++++--------
 4 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 50888d42e9..9ecdc8b265 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2024-11-20  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Texinfo/XSLoader.pm (init), tp/Texinfo/DocumentXS.pm (BEGIN),
+       tp/Texinfo/Parser.pm (BEGIN): do not try to add libraries to
+       @DynaLoader::dl_resolve_using, in general they are not used when
+       loading XS object, only the paths registered in the objects are used.
+
 2024-11-20  Gavin Smith <gavinsmith0123@gmail.com>
 
        * README-hacking: add note about reproducibility of
diff --git a/tp/Texinfo/DocumentXS.pm b/tp/Texinfo/DocumentXS.pm
index 332a07e592..bc78653275 100644
--- a/tp/Texinfo/DocumentXS.pm
+++ b/tp/Texinfo/DocumentXS.pm
@@ -30,7 +30,6 @@ BEGIN {
       undef,
       "DocumentXS",
       undef,
-      ['-ltexinfoxs', '-ltexinfo'],
   );
 }
 
diff --git a/tp/Texinfo/Parser.pm b/tp/Texinfo/Parser.pm
index d87901951f..e47ffe1972 100644
--- a/tp/Texinfo/Parser.pm
+++ b/tp/Texinfo/Parser.pm
@@ -34,7 +34,6 @@ 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 db6bd90570..b782f26bd5 100644
--- a/tp/Texinfo/XSLoader.pm
+++ b/tp/Texinfo/XSLoader.pm
@@ -108,7 +108,7 @@ sub init {
      $fallback_module,
      $module_name,
      $perl_extra_file,
-     $additional_libraries,
+     #$additional_libraries,
    ) = @_;
 
   # Possible values for TEXINFO_XS environment variable:
@@ -178,18 +178,22 @@ sub init {
   }
   my $dlpath = $found_files[0];
 
-  if ($additional_libraries and scalar(@$additional_libraries)) {
-    my @found_additional_libraries
-      = DynaLoader::dl_findfile(@$additional_libraries);
-    _debug("additional libraries: ".join('|', @$additional_libraries));
-    _debug("found additional: ".join('|', @found_additional_libraries));
-    push @DynaLoader::dl_resolve_using, @found_additional_libraries;
-  }
+  # After testing, it seems that putting libraries files in
+  # @DynaLoader::dl_resolve_using does not ensure that they are found when
+  # dlopen'ing.
+  #if ($additional_libraries and scalar(@$additional_libraries)) {
+  #  my @found_additional_libraries
+  #    = DynaLoader::dl_findfile(@$additional_libraries);
+  #  _debug("additional libraries: ".join('|', @$additional_libraries));
+  #  _debug("found additional: ".join('|', @found_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);
   if (!defined($libref)) {
+    # dl_error messages ends with a spurious NULL ^@
     my $message = DynaLoader::dl_error();
     _fatal("$module_name: couldn't load file $dlpath: $message");
     goto FALLBACK;