cygwin: libedit patch for cygwin

This commit is contained in:
Rok Garbas 2015-06-05 10:34:00 +02:00
parent da10587d1b
commit 0a7c5e4f68
2 changed files with 29 additions and 0 deletions

View File

@ -0,0 +1,25 @@
--- libedit-20120311-3.0/src/chartype.h 2012-03-11 10:54:58.000000000 +0100
+++ libedit-20120311-3.0/src/chartype.h 2012-05-03 19:00:20.651847423 +0200
@@ -56,9 +56,11 @@
/* Oh for a <uchar.h> with char32_t and __STDC_UTF_32__ in it...
* ref: ISO/IEC DTR 19769
*/
+#ifndef __CYGWIN__
#if WCHAR_MAX < INT32_MAX
#warning Build environment does not support non-BMP characters
#endif
+#endif
#ifndef HAVE_WCSDUP
wchar_t *wcsdup(const wchar_t *s);
--- libedit-20120311-3.0/src/editline/readline.h 2011-02-26 23:42:59.000000000 +0100
+++ libedit-20120311-3.0/src/editline/readline.h 2012-05-03 19:00:49.211244803 +0200
@@ -75,7 +75,7 @@ typedef KEYMAP_ENTRY *Keymap;
#ifndef CTRL
#include <sys/ioctl.h>
-#if !defined(__sun) && !defined(__hpux) && !defined(_AIX)
+#if !defined(__sun) && !defined(__hpux) && !defined(_AIX) && !defined(__CYGWIN__)
#include <sys/ttydefaults.h>
#endif
#ifndef CTRL

View File

@ -11,6 +11,10 @@ stdenv.mkDerivation rec {
# Have `configure' avoid `/usr/bin/nroff' in non-chroot builds.
NROFF = "${groff}/bin/nroff";
patches = if stdenv.isCygwin then [
./01-cygwin.patch
] else null;
postInstall = ''
sed -i ${stdenv.lib.optionalString (stdenv.isDarwin && stdenv.cc.nativeTools) "''"} s/-lncurses/-lncursesw/g $out/lib/pkgconfig/libedit.pc
'';