unofficial mirror of guix-devel@gnu.org 
 help / color / mirror / code / Atom feed
From: Jan Nieuwenhuizen <janneke@gnu.org>
To: guix-devel@gnu.org
Subject: [PATCH 11/11] gnu: readline: support mingw.
Date: Tue,  9 Aug 2016 08:41:39 +0200	[thread overview]
Message-ID: <20160809064139.27872-12-janneke@gnu.org> (raw)
In-Reply-To: <20160809064139.27872-1-janneke@gnu.org>

* gnu/packages/patches/readline-6.3-mingw.patch: New file.
* gnu-system.am (dist_patch_DATA): Add it.
* gnu/packages/readline.scm (readline): Support mingw.
---
 gnu/packages/readline.scm | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/readline.scm b/gnu/packages/readline.scm
index 169a738..2df22dd 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 (mingw-target?)
+                               '("bash_cv_termcap_lib=ncurses")
                                '()))
 
+                   #:make-flags (list ,@(if (mingw-target?)
+                                            ;; MinGW: termcap in ncurses
+                                            ;; some SIG_* #defined in _POSIX
+                                            '("TERMCAP_LIB=-lncurses"
+                                              "CPPFLAGS=-D_POSIX")
+                                            '()))
                    #:phases (alist-cons-after
                              'install 'post-install
                              ,post-install-phase
-- 
2.9.2

  parent reply	other threads:[~2016-08-09  6:42 UTC|newest]

Thread overview: 33+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-08-09  6:41 mingw guile.exe cross build patch series v9 Jan Nieuwenhuizen
2016-08-09  6:41 ` [PATCH 01/11] gnu: Add gcc-cross-x86_64 packages for testing Jan Nieuwenhuizen
2016-08-09  6:41 ` [PATCH 02/11] gnu: Add mingw-w64 Jan Nieuwenhuizen
2016-08-09  7:28   ` Alex Kost
2016-08-09 15:56     ` Jan Nieuwenhuizen
2016-08-10 10:37       ` Alex Kost
2016-08-09  6:41 ` [PATCH 03/11] gnu: cross-build: i686-w64-mingw32: new cross target Jan Nieuwenhuizen
2016-08-09  6:41 ` [PATCH 04/11] gnu: Add function libiconv-if-needed Jan Nieuwenhuizen
2016-08-09  6:41 ` [PATCH 05/11] gnu: libunistring: support mingw: propagate libiconv if needed Jan Nieuwenhuizen
2016-08-09  7:37   ` Alex Kost
2016-08-09 16:00     ` Jan Nieuwenhuizen
2016-08-09  6:41 ` [PATCH 06/11] gnu: gmp: build shared library for mingw Jan Nieuwenhuizen
2016-08-09  6:41 ` [PATCH 07/11] gnu: ncurses: support mingw Jan Nieuwenhuizen
2016-08-09  7:53   ` Alex Kost
2016-08-09 15:59     ` Jan Nieuwenhuizen
2016-08-10 10:47       ` Alex Kost
2016-08-10 13:08         ` Jan Nieuwenhuizen
2016-08-10 18:04           ` Mark H Weaver
2016-08-14 16:54   ` Mark H Weaver
2016-08-15 16:37     ` Jan Nieuwenhuizen
2016-08-16 10:26       ` Ricardo Wurmus
2016-08-16 11:53         ` Guile question ... " Jan Nieuwenhuizen
2016-08-16 18:24           ` Jan Nieuwenhuizen
2016-08-09  6:41 ` [PATCH 08/11] gnu: cross-base: Add cross-libtool Jan Nieuwenhuizen
2016-08-09  8:08   ` Alex Kost
2016-08-09 16:04     ` Jan Nieuwenhuizen
2016-08-10 11:12       ` Alex Kost
2016-08-09  6:41 ` [PATCH 09/11] gnu: libtool: support cross-libtool mingw Jan Nieuwenhuizen
2016-08-09  6:41 ` [PATCH 10/11] gnu: ncurses: build mingw with libtool Jan Nieuwenhuizen
2016-08-09  6:41 ` Jan Nieuwenhuizen [this message]
2016-08-09  8:30 ` mingw guile.exe cross build patch series v9 Andy Wingo
2016-08-09 15:41   ` Jan Nieuwenhuizen
2016-08-10 11:03   ` Alex Kost

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20160809064139.27872-12-janneke@gnu.org \
    --to=janneke@gnu.org \
    --cc=guix-devel@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).