JehanneOS/mksh
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

MSYS implies -DMKSH_ASSUME_UTF8=0 and thus can skip the test that’d fail

Browse Source
This commit is contained in:
tg 2012-01-03 01:40:15 +00:00
parent e1fa966570
commit 34036ec32e
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Build.sh
View File

@ -1,5 +1,5 @@
#!/bin/sh #!/bin/sh
srcversion='$MirOS: src/bin/mksh/Build.sh,v 1.504 2012/01/03 01:30:16 tg Exp $' srcversion='$MirOS: src/bin/mksh/Build.sh,v 1.505 2012/01/03 01:40:13 tg Exp $'
#- #-
# Copyright (c) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, # Copyright (c) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
# 2011, 2012 # 2011, 2012
@ -442,7 +442,7 @@ GNU/kFreeBSD)
esac esac
;; ;;
Haiku) Haiku)
add_cppflags -DMKSH_ASSUME_UTF8 add_cppflags -DMKSH_ASSUME_UTF8; HAVE_ISSET_MKSH_ASSUME_UTF8=1
;; ;;
HP-UX) HP-UX)
;; ;;
@ -477,6 +477,7 @@ Minix)
MirBSD) MirBSD)
;; ;;
MSYS_*) MSYS_*)
add_cppflags -DMKSH_ASSUME_UTF8=0; HAVE_ISSET_MKSH_ASSUME_UTF8=1
# almost same as CYGWIN* (from RT|Chatzilla) # almost same as CYGWIN* (from RT|Chatzilla)
: ${HAVE_SETLOCALE_CTYPE=0} : ${HAVE_SETLOCALE_CTYPE=0}
# broken on this OE (from ir0nh34d) # broken on this OE (from ir0nh34d)
@ -500,7 +501,7 @@ Plan9)
add_cppflags -D_LIMITS_EXTENSION add_cppflags -D_LIMITS_EXTENSION
add_cppflags -D_BSD_EXTENSION add_cppflags -D_BSD_EXTENSION
add_cppflags -D_SUSV2_SOURCE add_cppflags -D_SUSV2_SOURCE
add_cppflags -DMKSH_ASSUME_UTF8 add_cppflags -DMKSH_ASSUME_UTF8; HAVE_ISSET_MKSH_ASSUME_UTF8=1
oswarn=' and will currently not work' oswarn=' and will currently not work'
add_cppflags -DMKSH_UNEMPLOYED add_cppflags -DMKSH_UNEMPLOYED
;; ;;
@ -1261,7 +1262,7 @@ else
#define EXTERN #define EXTERN
#define MKSH_INCLUDES_ONLY #define MKSH_INCLUDES_ONLY
#include "sh.h" #include "sh.h"
__RCSID("$MirOS: src/bin/mksh/Build.sh,v 1.504 2012/01/03 01:30:16 tg Exp $"); __RCSID("$MirOS: src/bin/mksh/Build.sh,v 1.505 2012/01/03 01:40:13 tg Exp $");
int main(void) { printf("Hello, World!\n"); return (0); } int main(void) { printf("Hello, World!\n"); return (0); }
EOF EOF
case $cm in case $cm in

4
check.t
View File

@ -1,4 +1,4 @@
# $MirOS: src/bin/mksh/check.t,v 1.508 2012/01/03 00:58:07 tg Exp $ # $MirOS: src/bin/mksh/check.t,v 1.509 2012/01/03 01:40:15 tg Exp $
# $OpenBSD: bksl-nl.t,v 1.2 2001/01/28 23:04:56 niklas 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: 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 $ # $OpenBSD: read.t,v 1.3 2003/03/10 03:48:16 david Exp $
@ -6048,7 +6048,7 @@ description:
-UMKSH_ASSUME_UTF8 => not expected, but if your OS is old, -UMKSH_ASSUME_UTF8 => not expected, but if your OS is old,
try passing HAVE_SETLOCALE_CTYPE=0 to Build.sh try passing HAVE_SETLOCALE_CTYPE=0 to Build.sh
need-pass: no need-pass: no
category: !os:hpux category: !os:hpux,!os:msys
need-ctty: yes need-ctty: yes
arguments: !-i! arguments: !-i!
env-setup: !PS1=!PS2=!LC_CTYPE=en_US.UTF-8! env-setup: !PS1=!PS2=!LC_CTYPE=en_US.UTF-8!