[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
08/19: gnu: readline: Remove input labels.
From: |
guix-commits |
Subject: |
08/19: gnu: readline: Remove input labels. |
Date: |
Sun, 26 Jun 2022 17:24:47 -0400 (EDT) |
mbakke pushed a commit to branch core-updates
in repository guix.
commit 1c3fe0e491a09e62f487b550b8f6d4fa26e888bd
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Sun Jun 26 15:06:14 2022 +0200
gnu: readline: Remove input labels.
* gnu/packages/readline.scm (readline)[arguments]: Convert to G-expression.
Don't look up inputs by label.
---
gnu/packages/readline.scm | 44 ++++++++++++++++++++++++--------------------
1 file changed, 24 insertions(+), 20 deletions(-)
diff --git a/gnu/packages/readline.scm b/gnu/packages/readline.scm
index f8e4c6c3d7..b6cdeb4f84 100644
--- a/gnu/packages/readline.scm
+++ b/gnu/packages/readline.scm
@@ -3,7 +3,7 @@
;;; Copyright © 2016, 2019 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2018, 2021 Tobias Geerinckx-Rice <me@tobias.gr>
-;;; Copyright © 2019, 2020 Marius Bakke <marius@gnu.org>
+;;; Copyright © 2019, 2020, 2022 Marius Bakke <marius@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -27,6 +27,7 @@
#:use-module (gnu packages ncurses)
#:use-module (gnu packages perl)
#:use-module (guix packages)
+ #:use-module (guix gexp)
#:use-module (guix download)
#:use-module (guix git-download)
#:use-module (guix build-system gnu)
@@ -80,27 +81,30 @@
(patch-flags '("-p0"))))
(build-system gnu-build-system)
(propagated-inputs (list ncurses))
- (arguments `(#:configure-flags
- (list (string-append "LDFLAGS=-Wl,-rpath -Wl,"
- (assoc-ref %build-inputs "ncurses")
- "/lib")
+ (arguments
+ (list #:configure-flags
+ #~(list (string-append
+ "LDFLAGS=-Wl,-rpath -Wl,"
+ (dirname (search-input-file %build-inputs
+ "lib/libncurses.so")))
- ;; This test does an 'AC_TRY_RUN', which aborts when
- ;; cross-compiling, so provide the correct answer.
- ,@(if (%current-target-system)
- '("bash_cv_wcwidth_broken=no")
- '())
- ;; MinGW: ncurses provides the termcap api.
- ,@(if (target-mingw?)
- '("bash_cv_termcap_lib=ncurses")
- '()))
+ ;; This test does an 'AC_TRY_RUN', which aborts when
+ ;; cross-compiling, so provide the correct answer.
+ #$@(if (%current-target-system)
+ '("bash_cv_wcwidth_broken=no")
+ '())
+ ;; MinGW: ncurses provides the termcap api.
+ #$@(if (target-mingw?)
+ '("bash_cv_termcap_lib=ncurses")
+ '()))
- ,@(if (target-mingw?)
- ;; MinGW: termcap in ncurses
- ;; some SIG_* #defined in _POSIX
- '(#:make-flags '("TERMCAP_LIB=-lncurses"
- "CPPFLAGS=-D_POSIX
-D'chown(f,o,g)=0'"))
- '())))
+ #:make-flags
+ (if (target-mingw?)
+ ;; MinGW: termcap in ncurses
+ ;; some SIG_* #defined in _POSIX
+ #~'("TERMCAP_LIB=-lncurses"
+ "CPPFLAGS=-D_POSIX -D'chown(f,o,g)=0'")
+ #~'())))
(synopsis "Edit command lines while typing, with history support")
(description
"The GNU readline library allows users to edit command lines as they
- branch core-updates updated (03e13c8981 -> ea53e292a8), guix-commits, 2022/06/26
- 03/19: gnu: isl: Update to 0.24., guix-commits, 2022/06/26
- 07/19: gnu: readline: Update to 8.1.2., guix-commits, 2022/06/26
- 04/19: gnu: binutils: Update to 2.38., guix-commits, 2022/06/26
- 12/19: gnu: libgpg-error: Update to 1.45., guix-commits, 2022/06/26
- 14/19: gnu: gdbm: Update to 1.23., guix-commits, 2022/06/26
- 13/19: gnu: libgcrypt: Update to 1.10.1., guix-commits, 2022/06/26
- 15/19: gnu: libbsd: Update to 0.11.6., guix-commits, 2022/06/26
- 05/19: gnu: gawk: Update to 5.1.1., guix-commits, 2022/06/26
- 08/19: gnu: readline: Remove input labels.,
guix-commits <=
- 11/19: gnu: bison: Update to 3.8.2., guix-commits, 2022/06/26
- 06/19: gnu: gawk: Use G-expressions and remove labels., guix-commits, 2022/06/26
- 16/19: gnu: GnuTLS: Update to 3.7.6., guix-commits, 2022/06/26
- 19/19: gnu: Tcl/Tk: Update to 8.6.12., guix-commits, 2022/06/26
- 09/19: gnu: util-linux: Update to 2.37.4., guix-commits, 2022/06/26
- 18/19: gnu: libgpg-error: Remove input label., guix-commits, 2022/06/26
- 02/19: gnu: Remove guile@3.0.7., guix-commits, 2022/06/26
- 01/19: gnu: m4: Fix cross-compilation., guix-commits, 2022/06/26
- 10/19: gnu: util-linux: Use G-expressions., guix-commits, 2022/06/26
- 17/19: gnu: Remove p11-kit@0.23.22., guix-commits, 2022/06/26