diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2014-03-26 16:31:57 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2014-03-26 16:31:57 +0100 |
| commit | 4979ee04f07defb55dc448a5682913dc41935760 (patch) | |
| tree | 03d0a1ed2bd7c7d141d2af09ea01b66fa62e3d88 /gnu/packages/readline.scm | |
| parent | 07fb21b231b8d86cc17beff64111759b972ffcac (diff) | |
| parent | eafee15b3ce3638058c43974244964dbd48ec15d (diff) | |
| download | gnu-guix-4979ee04f07defb55dc448a5682913dc41935760.tar gnu-guix-4979ee04f07defb55dc448a5682913dc41935760.tar.gz | |
Merge branch 'core-updates'
Diffstat (limited to 'gnu/packages/readline.scm')
| -rw-r--r-- | gnu/packages/readline.scm | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/gnu/packages/readline.scm b/gnu/packages/readline.scm index 3dca1de4d4..f35a52f614 100644 --- a/gnu/packages/readline.scm +++ b/gnu/packages/readline.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2012, 2013, 2014 Ludovic Courtès <ludo@gnu.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -38,14 +38,14 @@ (find-files lib "\\.a")))))) (package (name "readline") - (version "6.2") + (version "6.3") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/readline/readline-" version ".tar.gz")) (sha256 (base32 - "10ckm2bd2rkxhvdmj7nmbsylmihw0abwcsnxf8y27305183rd9kr")) + "0hzxr9jxqqx5sxsv9vmlxdnvlr9vi4ih1avjb869hbs6p5qn1fjn")) (patches (list (search-patch "readline-link-ncurses.patch"))) (patch-flags '("-p0")))) (build-system gnu-build-system) @@ -53,7 +53,13 @@ (arguments `(#:configure-flags (list (string-append "LDFLAGS=-Wl,-rpath -Wl," (assoc-ref %build-inputs "ncurses") - "/lib")) + "/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") + '())) #:phases (alist-cons-after 'install 'post-install |