From f6d47eb6d5e046abc8a7a7dc0863c5661197ef0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 19 Mar 2014 23:21:26 +0100 Subject: [PATCH] gnu: readline: Fix cross-compilation. * gnu/packages/readline.scm (readline)[arguments]: Add "bash_cv_wcwidth_broken=no" to #:configure-flags when (%current-target-system) is true. --- gnu/packages/readline.scm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/gnu/packages/readline.scm b/gnu/packages/readline.scm index cf1bd67ce2..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 +;;; Copyright © 2012, 2013, 2014 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -53,7 +53,13 @@ (define-public readline (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