From f92108dcccd19bc61239644228efa46447905770 Mon Sep 17 00:00:00 2001 From: tg Date: Sat, 5 Nov 2011 23:39:02 +0000 Subject: [PATCH] make MSYS match Cygwin more closely; ignore its broken --- Build.sh | 10 ++++++---- check.t | 8 ++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/Build.sh b/Build.sh index 6561cf6..c61de01 100644 --- a/Build.sh +++ b/Build.sh @@ -1,5 +1,5 @@ #!/bin/sh -srcversion='$MirOS: src/bin/mksh/Build.sh,v 1.488 2011/10/07 19:51:41 tg Exp $' +srcversion='$MirOS: src/bin/mksh/Build.sh,v 1.489 2011/11/05 23:39:01 tg Exp $' #- # Copyright (c) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 # Thorsten Glaser @@ -482,8 +482,10 @@ Minix) MirBSD) ;; MSYS_*) - # probably same as CYGWIN* – need to test; from RT|Chatzilla - oswarn='but will probably work' + # almost same as CYGWIN* (from RT|Chatzilla) + : ${HAVE_SETLOCALE_CTYPE=0} + # broken on this OE (from ir0nh34d) + : ${HAVE_STDINT_H=0} ;; NetBSD) ;; @@ -1180,7 +1182,7 @@ else #define EXTERN #define MKSH_INCLUDES_ONLY #include "sh.h" - __RCSID("$MirOS: src/bin/mksh/Build.sh,v 1.488 2011/10/07 19:51:41 tg Exp $"); + __RCSID("$MirOS: src/bin/mksh/Build.sh,v 1.489 2011/11/05 23:39:01 tg Exp $"); int main(void) { printf("Hello, World!\n"); return (0); } EOF case $cm in diff --git a/check.t b/check.t index e9a6584..7cd9fc8 100644 --- a/check.t +++ b/check.t @@ -1,4 +1,4 @@ -# $MirOS: src/bin/mksh/check.t,v 1.485 2011/10/26 20:46:13 tg Exp $ +# $MirOS: src/bin/mksh/check.t,v 1.486 2011/11/05 23:39:02 tg Exp $ # $OpenBSD: bksl-nl.t,v 1.2 2001/01/28 23:04:56 niklas Exp $ # $OpenBSD: history.t,v 1.5 2001/01/28 23:04:56 niklas Exp $ # $OpenBSD: read.t,v 1.3 2003/03/10 03:48:16 david Exp $ @@ -1010,7 +1010,7 @@ description: Check package for cd -Pe need-pass: no # the mv command fails on Cygwin -category: !os:cygwin +category: !os:cygwin,!os:msys file-setup: file 644 "x" mkdir noread noread/target noread/target/subdir ln -s noread link @@ -1911,7 +1911,7 @@ description: Check that globbing matches the right things... # breaks on Mac OSX (HFS+ non-standard Unicode canonical decomposition) # breaks on Cygwin 1.7 (files are now UTF-16 or something) -category: !os:cygwin,!os:darwin +category: !os:cygwin,!os:darwin,!os:msys file-setup: file 644 "aÂc" stdin: echo a[Á-Ú]* @@ -5821,7 +5821,7 @@ description: note: cygwin execve(2) doesn't return to us with ENOEXEC, we lose note: Ultrix perl5 t4 returns 65280 (exit-code 255) and no text need-pass: no -category: !os:cygwin,!os:uwin-nt,!os:ultrix,!smksh +category: !os:cygwin,!os:msys,!os:ultrix,!os:uwin-nt,!smksh env-setup: !FOO=BAR! stdin: print '#!'"$__progname"'\nprint "1 a=$ENV{FOO}";' >t1