texinfo-commits
[Top][All Lists]
Advanced

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

branch master updated: * tp/Texinfo/DocumentXS.pm (BEGIN), tp/Texinfo/Pa


From: Patrice Dumas
Subject: branch master updated: * tp/Texinfo/DocumentXS.pm (BEGIN), tp/Texinfo/Parser.pm (BEGIN), tp/Texinfo/XSLoader.pm (init): remove leading -l for specified additional libraries.
Date: Fri, 22 Nov 2024 04:48:22 -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 4d26bdac4c * tp/Texinfo/DocumentXS.pm (BEGIN), tp/Texinfo/Parser.pm 
(BEGIN), tp/Texinfo/XSLoader.pm (init): remove leading -l for specified 
additional libraries.
4d26bdac4c is described below

commit 4d26bdac4c4bd38ccdef1f8a460603242ce43c00
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Fri Nov 22 10:48:16 2024 +0100

    * tp/Texinfo/DocumentXS.pm (BEGIN), tp/Texinfo/Parser.pm (BEGIN),
    tp/Texinfo/XSLoader.pm (init): remove leading -l for specified
    additional libraries.
---
 ChangeLog                | 6 ++++++
 tp/Texinfo/DocumentXS.pm | 2 +-
 tp/Texinfo/Parser.pm     | 2 +-
 tp/Texinfo/XSLoader.pm   | 4 ++--
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 35347323c4..7219d241b4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2024-11-22  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Texinfo/DocumentXS.pm (BEGIN), tp/Texinfo/Parser.pm (BEGIN),
+       tp/Texinfo/XSLoader.pm (init): remove leading -l for specified
+       additional libraries.
+
 2024-11-21  Gavin Smith <gavinsmith0123@gmail.com>
 
        Load libtexinfo before libtexinfoxs
diff --git a/tp/Texinfo/DocumentXS.pm b/tp/Texinfo/DocumentXS.pm
index daa1a2bfc2..faa20172a3 100644
--- a/tp/Texinfo/DocumentXS.pm
+++ b/tp/Texinfo/DocumentXS.pm
@@ -30,7 +30,7 @@ BEGIN {
       undef,
       "DocumentXS",
       undef,
-      ['-ltexinfo', '-ltexinfoxs'],
+      ['texinfo', 'texinfoxs'],
   );
 }
 
diff --git a/tp/Texinfo/Parser.pm b/tp/Texinfo/Parser.pm
index a9219402ba..e12c468ea8 100644
--- a/tp/Texinfo/Parser.pm
+++ b/tp/Texinfo/Parser.pm
@@ -34,7 +34,7 @@ BEGIN {
       "Texinfo::ParserNonXS",
       $shared_library_name,
       "Texinfo::XS::parsetexi::Parsetexi",
-      ['-ltexinfo', '-ltexinfoxs'],
+      ['texinfo', 'texinfoxs'],
   );
 }
 
diff --git a/tp/Texinfo/XSLoader.pm b/tp/Texinfo/XSLoader.pm
index 9c0fcb9158..d829058c4b 100644
--- a/tp/Texinfo/XSLoader.pm
+++ b/tp/Texinfo/XSLoader.pm
@@ -205,8 +205,8 @@ sub init {
   }
 
   if ($additional_libraries) {
-    for my $additional_library (@{$additional_libraries}) {
-      $additional_library =~ s/^-l/lib/;
+    for my $additional_library_name (@{$additional_libraries}) {
+      my $additional_library = 'lib' . $additional_library_name;
       if (!$loaded_additional_libraries->{$additional_library}) {
         my $ref = load_libtool_library($additional_library);
         if (!$ref) {



reply via email to

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