diff options
| author | Leo Famulari <leo@famulari.name> | 2017-01-06 17:14:41 -0500 |
|---|---|---|
| committer | Leo Famulari <leo@famulari.name> | 2017-01-06 17:14:41 -0500 |
| commit | 74288230ea8b2310495dc2739f39ceadcc143fd0 (patch) | |
| tree | 73ba6c7c13d59c5f92b409c94dccfff159e08f4d /gnu/packages/readline.scm | |
| parent | 92e779592d269ca1924f184496eb4ca832997b12 (diff) | |
| parent | aa21c764d65068783ae31febee2a92eb3d138a24 (diff) | |
| download | patches-74288230ea8b2310495dc2739f39ceadcc143fd0.tar patches-74288230ea8b2310495dc2739f39ceadcc143fd0.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/readline.scm')
| -rw-r--r-- | gnu/packages/readline.scm | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/gnu/packages/readline.scm b/gnu/packages/readline.scm index 43817791b5..16a31afd73 100644 --- a/gnu/packages/readline.scm +++ b/gnu/packages/readline.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2012, 2013, 2014 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -24,7 +25,8 @@ #:use-module (gnu packages perl) #:use-module (guix packages) #:use-module (guix download) - #:use-module (guix build-system gnu)) + #:use-module (guix build-system gnu) + #:use-module (guix utils)) (define-public readline (let ((post-install-phase @@ -61,8 +63,18 @@ ;; 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'")) + '()) #:phases (alist-cons-after 'install 'post-install ,post-install-phase |