texinfo-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

branch master updated: * tp/Texinfo/XSLoader.pm (init): do not fallback


From: Patrice Dumas
Subject: branch master updated: * tp/Texinfo/XSLoader.pm (init): do not fallback if additional libraries are not found and texi2any libraries are installed. Indeed, in that case, there could be RUNPATH or similar pointing to the installation directory in the XS modules objects themselves, so the libraries can still be found if the libraries .la are not found.
Date: Sun, 01 Dec 2024 09:14:40 -0500

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 6a42302f28 * tp/Texinfo/XSLoader.pm (init): do not fallback if 
additional libraries are not found and texi2any libraries are installed.  
Indeed, in that case, there could be RUNPATH or similar pointing to the 
installation directory in the XS modules objects themselves, so the libraries 
can still be found if the libraries .la are not found.
6a42302f28 is described below

commit 6a42302f283ce1eeabfae1873379f486f52656f8
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sun Dec 1 15:14:28 2024 +0100

    * tp/Texinfo/XSLoader.pm (init): do not fallback if additional
    libraries are not found and texi2any libraries are installed.  Indeed,
    in that case, there could be RUNPATH or similar pointing to the
    installation directory in the XS modules objects themselves, so the
    libraries can still be found if the libraries .la are not found.
---
 ChangeLog              | 8 ++++++++
 tp/Texinfo/XSLoader.pm | 7 ++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 0a392678e5..a062229773 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2024-12-01  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Texinfo/XSLoader.pm (init): do not fallback if additional
+       libraries are not found and texi2any libraries are installed.  Indeed,
+       in that case, there could be RUNPATH or similar pointing to the
+       installation directory in the XS modules objects themselves, so the
+       libraries can still be found if the libraries .la are not found.
+
 2024-12-01  Gavin Smith <gavinsmith0123@gmail.com>
 
        Set LC_MESSAGES via setenv before setlocale.
diff --git a/tp/Texinfo/XSLoader.pm b/tp/Texinfo/XSLoader.pm
index 784e9ac9ce..6519265fbd 100644
--- a/tp/Texinfo/XSLoader.pm
+++ b/tp/Texinfo/XSLoader.pm
@@ -215,7 +215,12 @@ sub init {
       my $additional_library = 'lib' . $additional_library_name;
       if (!$loaded_additional_libraries->{$additional_library}) {
         my $ref = load_libtool_library($additional_library);
-        if (!$ref) {
+        # if the libraries are installed but .la were removed, in general
+        # they will be found as there are RUNPATH or similar pointing
+        # to the installation directory in the XS modules objects themselves,
+        # so we do not fallback if the libraries are not found.
+        if (!$ref and (not defined($Texinfo::ModulePath::texinfo_uninstalled)
+                       or $Texinfo::ModulePath::texinfo_uninstalled)) {
           goto FALLBACK;
         } else {
           $loaded_additional_libraries->{$additional_library} = $ref;



reply via email to

[Prev in Thread] Current Thread [Next in Thread]