aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages
diff options
context:
space:
mode:
authorEric Bavier <bavier@member.fsf.org>2020-01-22 22:50:55 -0600
committerEric Bavier <bavier@member.fsf.org>2020-01-22 22:50:55 -0600
commit30adc9e0e14f56e45f5d4909c3105dce6d016778 (patch)
tree079ee0a07eeabda79cf8dd2861382e41f17fd2c3 /gnu/packages
parentc356e65610f287e740d3ec25cf5301f8e928a654 (diff)
downloadguix-30adc9e0e14f56e45f5d4909c3105dce6d016778.tar.gz
guix-30adc9e0e14f56e45f5d4909c3105dce6d016778.zip
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.
Diffstat (limited to 'gnu/packages')
-rw-r--r--gnu/packages/perl.scm16
1 files changed, 10 insertions, 6 deletions
diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm
index 98fc302ddd..9fc3493a5d 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 <ludo@gnu.org>
;;; Copyright © 2013, 2019 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2015, 2016, 2017, 2019 Ricardo Wurmus <rekado@elephly.net>
-;;; Copyright © 2015, 2016, 2017, 2019 Eric Bavier <bavier@member.fsf.org>
+;;; Copyright © 2015, 2016, 2017, 2019, 2020 Eric Bavier <bavier@posteo.net>
;;; Copyright © 2015 Eric Dvorsak <eric@dvorsak.fr>
;;; Copyright © 2016, 2018 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2016 Jochem Raat <jchmrt@riseup.net>
@@ -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
s/databases.scm, gnu/packages/django.scm, gnu/packages/dns.scm, gnu/packages/emacs.scm, gnu/packages/enlightenment.scm, gnu/packages/fonts.scm, gnu/packages/fontutils.scm, gnu/packages/forth.scm, gnu/packages/fvwm.scm, gnu/packages/games.scm, gnu/packages/gl.scm, gnu/packages/gnome.scm, gnu/packages/gnunet.scm, gnu/packages/gnupg.scm, gnu/packages/gnuzilla.scm, gnu/packages/gtk.scm, gnu/packages/guile-wm.scm, gnu/packages/guile.scm, gnu/packages/haskell-check.scm, gnu/packages/haskell-crypto.scm, gnu/packages/haskell.scm, gnu/packages/image-viewers.scm, gnu/packages/image.scm, gnu/packages/irc.scm, gnu/packages/language.scm, gnu/packages/libcanberra.scm, gnu/packages/linux.scm, gnu/packages/lisp.scm, gnu/packages/lolcode.scm, gnu/packages/lxde.scm, gnu/packages/lxqt.scm, gnu/packages/mail.scm, gnu/packages/markup.scm, gnu/packages/mate.scm, gnu/packages/maths.scm, gnu/packages/mc.scm, gnu/packages/messaging.scm, gnu/packages/music.scm, gnu/packages/ncurses.scm, gnu/packages/networking.scm, gnu/packages/nickle.scm, gnu/packages/openbox.scm, gnu/packages/pdf.scm, gnu/packages/perl-check.scm, gnu/packages/perl.scm, gnu/packages/python-crypto.scm, gnu/packages/python-web.scm, gnu/packages/python.scm, gnu/packages/qt.scm, gnu/packages/ruby.scm, gnu/packages/rust.scm, gnu/packages/scheme.scm, gnu/packages/serialization.scm, gnu/packages/shells.scm, gnu/packages/ssh.scm, gnu/packages/suckless.scm, gnu/packages/tbb.scm, gnu/packages/telephony.scm, gnu/packages/text-editors.scm, gnu/packages/textutils.scm, gnu/packages/time.scm, gnu/packages/tls.scm, gnu/packages/tor.scm, gnu/packages/version-control.scm, gnu/packages/video.scm, gnu/packages/vim.scm, gnu/packages/web.scm, gnu/packages/wm.scm, gnu/packages/xdisorg.scm, gnu/packages/xfce.scm, gnu/packages/xml.scm, gnu/packages/xorg.scm, gnu/services/certbot.scm, gnu/services/desktop.scm, gnu/services/version-control.scm, gnu/services/web.scm, guix/import/hackage.scm, guix/licenses.scm: Likewise. Signed-off-by: Tobias Geerinckx-Rice <me@tobias.gr> ng0 2018-02-11mailmap: Adjust entries for ng0....Signed-off-by: Leo Famulari <leo@famulari.name> ng0 2017-11-26Update e-mail for ng0....* .mailmap: Update entries for ng0. Signed-off-by: Leo Famulari <leo@famulari.name> ng0 2017-10-03Update e-mail for Theodoros Foradis....* .mailmap: Add entry. * gnu/packages/aspell.scm: Replace theodoros.for@openmailbox.org with current address. * gnu/packages/compression.scm: Likewise. * gnu/packages/electronics.scm: Likewise. * gnu/packages/engineering.scm: Likewise. * gnu/packages/fpga.scm: Likewise. * gnu/packages/graphviz.scm: Likewise. * gnu/packages/guile.scm: Likewise. * gnu/packages/libusb.scm: Likewise. * gnu/packages/maths.scm: Likewise. * gnu/packages/messaging.scm: Likewise. * gnu/packages/uml.scm: Likewise. * gnu/packages/wxwidgets.scm: Likewise. Signed-off-by: Ludovic Courtès <ludo@gnu.org> Theodoros Foradis 2017-08-29Update e-mail for Kei Kebreau....* .mailmap: Map kei@openmailbox.org to current address. * gnu/local.mk: Replace kei@openmailbox.org to current address. * gnu/packages/backup.scm: Likewise. * gnu/packages/calendar.scm: Likewise. * gnu/packages/check.scm: Likewise. * gnu/packages/compression.scm: Likewise. * gnu/packages/documentation.scm: Likewise. * gnu/packages/emacs.scm: Likewise. * gnu/packages/fltk.scm: Likewise. * gnu/packages/freedesktop.scm: Likewise. * gnu/packages/game-development.scm: Likewise. * gnu/packages/games.scm: Likewise. * gnu/packages/gnome.scm: Likewise. * gnu/packages/gnustep.scm: Likewise. * gnu/packages/gtk.scm: Likewise. * gnu/packages/hexedit.scm: Likewise. * gnu/packages/image.scm: Likewise. * gnu/packages/maths.scm: Likewise. * gnu/packages/music.scm: Likewise. * gnu/packages/xfce.scm: Likewise. * gnu/packages/python.scm: Likewise. * gnu/packages/tcl.scm: Likewise. * gnu/packages/textutils.scm: Likewise. * gnu/packages/video.scm: Likewise. * gnu/packages/w3m.scm: Likewise. * gnu/packages/web.scm: Likewise. * gnu/packages/web-browsers.scm: Likewise. * gnu/packages/patches/wmfire-update-for-new-gdk-versions.patch: Likewise. Kei Kebreau 2017-08-13mailmap: fix entries for ng0....Signed-off-by: Kei Kebreau <kei@openmailbox.org> ng0 2017-06-16mailmap: Adjust entries for ng0....Signed-off-by: Alex Kost <alezost@gmail.com> ng0 2017-06-03.mailmap: Add another alias for ng0....Signed-off-by: Marius Bakke <mbakke@fastmail.com> ng0 2017-05-23mailmap: Update entries for Adriano Peluso...* .mailmap: Add new entry for Adriano Peluso Signed-off-by: Leo Famulari <leo@famulari.name> Adriano Peluso 2017-05-22mailmap: Add an entry for Mathieu Othacehe....This avoids duplicated entries with Othacehe in uppercase. Mathieu Othacehe 2017-04-20mailmap: Update entries for ng0....* .mailmap: Add new address for ng0 and map all existing commits to it. Signed-off-by: Tobias Geerinckx-Rice <me@tobias.gr> ng0 2017-01-27Update .mailmap entries for ng0....* .mailmap: Update entries for ng0. Signed-off-by: Tobias Geerinckx-Rice <me@tobias.gr> ng0 2017-01-01Update .mailmap....* .mailmap: Add new entries for Alex Sassmannshausen, Ben Woodcroft, Daniel Pimentel, David Hashe, George Clemmer, Ivan Vilata i Balaguer, Jeff Mickey, John J. Foerch, Marek Benc, Pjotr Prins, Raoul Jean Pierre Bonnal, Rene Saavedra, 宋文武, Stefan Reichör, Thomas Danckaert and Vincent Legoll. Alex Kost