[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#49025] [PATCH v4 core-updates 23/36] readline: Make #:configure-fla
From: |
Maxime Devos |
Subject: |
[bug#49025] [PATCH v4 core-updates 23/36] readline: Make #:configure-flags a G-expression. |
Date: |
Sat, 19 Jun 2021 17:04:45 +0200 |
This allos using ungexp and this-package-input later.
* gnu/packages/readline.scm
(readline)[arguments]<#:configure-flags>: Make this a
G-expression.
---
gnu/packages/readline.scm | 25 +++++++++++++------------
1 file changed, 13 insertions(+), 12 deletions(-)
diff --git a/gnu/packages/readline.scm b/gnu/packages/readline.scm
index ced8471887..7823a4e6ad 100644
--- a/gnu/packages/readline.scm
+++ b/gnu/packages/readline.scm
@@ -31,6 +31,7 @@
#:use-module (guix git-download)
#:use-module (guix build-system gnu)
#:use-module (guix utils)
+ #:use-module (guix gexp)
#:use-module (ice-9 format))
(define (patch-url version seqno)
@@ -78,19 +79,19 @@
(build-system gnu-build-system)
(propagated-inputs `(("ncurses" ,ncurses)))
(arguments `(#:configure-flags
- (list (string-append "LDFLAGS=-Wl,-rpath -Wl,"
- (assoc-ref %build-inputs "ncurses")
- "/lib")
+ ,#~(list (string-append "LDFLAGS=-Wl,-rpath -Wl,"
+ (assoc-ref %build-inputs "ncurses")
+ "/lib")
- ;; 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
--
2.32.0
- [bug#49025] [PATCH v4 core-updates 18/36] openssl: Use G-exp machinery for referring to outputs., (continued)
- [bug#49025] [PATCH v4 core-updates 18/36] openssl: Use G-exp machinery for referring to outputs., Maxime Devos, 2021/06/19
- [bug#49025] [PATCH v4 core-updates 20/36] openssl: Move all man pages to separate output, not only man3., Maxime Devos, 2021/06/19
- [bug#49025] [PATCH v4 core-updates 09/36] libgpg-error: Prevent silent miscompilation some systems., Maxime Devos, 2021/06/19
- [bug#49025] [PATCH v4 core-updates 21/36] openssl: Find bin/env when cross-compiling., Maxime Devos, 2021/06/19
- [bug#49025] [PATCH v4 core-updates 35/36] cross-base: Fix cross-compiler for i686-linux-gnu., Maxime Devos, 2021/06/19
- [bug#49025] [PATCH v4 core-updates 33/36] tk: Do not use %build-inputs when cross-compiling., Maxime Devos, 2021/06/19
- [bug#49025] [PATCH v4 core-updates 26/36] bash: Fix cross-compilation build error., Maxime Devos, 2021/06/19
- [bug#49025] [PATCH v4 core-updates 34/36] libelf: Use the cross-compiler when cross-compiling., Maxime Devos, 2021/06/19
- [bug#49025] [PATCH v4 core-updates 25/36] bash: Make #:configure-flags a G-expression., Maxime Devos, 2021/06/19
- [bug#49025] [PATCH v4 core-updates 32/36] tk: Make #:configure-flags a G-expression., Maxime Devos, 2021/06/19
- [bug#49025] [PATCH v4 core-updates 23/36] readline: Make #:configure-flags a G-expression.,
Maxime Devos <=