branch master updated: gnu: perl-term-readline-gnu: Fix library initialization.

[guix-commits]

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

bavier pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new 30adc9e  gnu: perl-term-readline-gnu: Fix library initialization.
30adc9e is described below

commit 30adc9e0e14f56e45f5d4909c3105dce6d016778
Author: Eric Bavier <address@hidden>
AuthorDate: Wed Jan 22 22:50:55 2020 -0600

    gnu: perl-term-readline-gnu: Fix library initialization.
    
    * gnu/packages/perl.scm (perl-term-readline-gnu)[arguments]: Patch library
    search directories into Makefile.PL so that the resulting Gnu.so library
    contains expected DT_NEEDED entries for libreadline and libncurses.
---
 gnu/packages/perl.scm | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm
index 98fc302..9fc3493 100644
--- a/gnu/packages/perl.scm
+++ b/gnu/packages/perl.scm
@@ -2,7 +2,7 @@
 ;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017 Ludovic Courtès 
<address@hidden>
 ;;; Copyright © 2013, 2019 Andreas Enge <address@hidden>
 ;;; Copyright © 2015, 2016, 2017, 2019 Ricardo Wurmus <address@hidden>
-;;; Copyright © 2015, 2016, 2017, 2019 Eric Bavier <address@hidden>
+;;; Copyright © 2015, 2016, 2017, 2019, 2020 Eric Bavier <address@hidden>
 ;;; Copyright © 2015 Eric Dvorsak <address@hidden>
 ;;; Copyright © 2016, 2018 Mark H Weaver <address@hidden>
 ;;; Copyright © 2016 Jochem Raat <address@hidden>
@@ -8513,12 +8513,16 @@ screen size, and retrieval/modification of the control 
characters.")
      `(#:tests? #f ; Tests fail without other Term::ReadLine interfaces present
        #:phases (modify-phases %standard-phases
                   (add-before 'configure 'patch-search-lib
-                    (lambda _
+                    (lambda* (#:key inputs #:allow-other-keys)
                       (substitute* "Makefile.PL"
-                        ;; The configuration provides no way to pass
-                        ;; additional directories to search for the ncurses
-                        ;; library, so just skip the search.
-                        (("&search_lib\\('-lncurses'\\)") "'-lncurses'")))))))
+                        ;; The configuration provides no way easy was to pass
+                        ;; additional directories to search for libraries, so
+                        ;; just patch in the flags.
+                        (("-lreadline" &)
+                         (format #f "-L~a/lib ~a" (assoc-ref inputs 
"readline") &))
+                        (("&search_lib\\('-lncurses'\\)")
+                         (string-append "'-L" (assoc-ref inputs "ncurses") 
"/lib"
+                                        " -lncurses'"))))))))
     (home-page "https://metacpan.org/release/Term-ReadLine-Gnu";)
     (synopsis "GNU Readline/History Library interface for Perl")
     (description "This module implements an interface to the GNU Readline