* Mac OSX 10.4 "Tiger"

- has an antiquated ed(1)
	  (I'm lucky it has one, some GNU/Linux don't...)
	- cannot build mksh statically linked
* Solaris (SunOS 5.8)
	- needs libdl when statically linked (NSSwitch problem)
	- /bin/sh is not XPG.4 compatible, don't use test -e
This commit is contained in:
tg 2005-05-23 17:24:23 +00:00
parent 7e07bd6fa7
commit 1c0262455c
2 changed files with 16 additions and 12 deletions

View File

@ -1,5 +1,5 @@
#!/bin/sh #!/bin/sh
# $MirOS: src/bin/mksh/Build.sh,v 1.2 2005/05/23 16:56:22 tg Exp $ # $MirOS: src/bin/mksh/Build.sh,v 1.3 2005/05/23 17:24:23 tg Exp $
#- #-
# Recognised command line parameters and their defaults: # Recognised command line parameters and their defaults:
# CC gcc # CC gcc
@ -9,11 +9,14 @@
# LIBS (empty) # LIBS (empty)
# srcdir (path of script) # srcdir (path of script)
# NROFF nroff # NROFF nroff
# Hints:
# Mac OSX LDFLAGS=
# Solaris LDFLAGS=
SHELL="${SHELL:-/bin/sh}" SHELL="${SHELL:-/bin/sh}"
CC="${CC:-gcc}" CC="${CC:-gcc}"
CFLAGS="${CFLAGS:--O2 -fno-strict-aliasing -fno-strength-reduce}" CFLAGS="${CFLAGS--O2 -fno-strict-aliasing -fno-strength-reduce}"
LDFLAGS="${LDFLAGS:--static}" LDFLAGS="${LDFLAGS--static}"
srcdir="${srcdir:-`dirname $0`}" srcdir="${srcdir:-`dirname $0`}"
curdir="`pwd`" curdir="`pwd`"
NROFF="${NROFF:-nroff}" NROFF="${NROFF:-nroff}"
@ -33,7 +36,7 @@ for hdr in errno signal; do
done done
echo Building... echo Building...
( cd $srcdir; $CC $CFLAGS $CPPFLAGS $LDFLAGS -o $curdir/mksh $SRCS $LIBS ) ( cd $srcdir; $CC $CFLAGS $CPPFLAGS $LDFLAGS -o $curdir/mksh $SRCS $LIBS )
test -e mksh || exit 1 test -x mksh || exit 1
echo Finalising... echo Finalising...
$NROFF -mdoc <$srcdir/mksh.1 >mksh.cat1 || rm -f mksh.cat1 $NROFF -mdoc <$srcdir/mksh.1 >mksh.cat1 || rm -f mksh.cat1
size mksh size mksh

17
check.t
View File

@ -1,4 +1,4 @@
# $MirOS: src/bin/mksh/check.t,v 1.9 2005/05/23 17:00:24 tg Exp $ # $MirOS: src/bin/mksh/check.t,v 1.10 2005/05/23 17:24:23 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 $
@ -1876,8 +1876,9 @@ name: history-ed-1-old
description: description:
Basic (ed) editing works (assumes you have generic ed editor Basic (ed) editing works (assumes you have generic ed editor
that prints no prompts). This is for oldish ed(1) which write that prints no prompts). This is for oldish ed(1) which write
the character count to stdout. Found on MS Interix/SFU 3.5. the character count to stdout. Found on MS Interix/SFU 3.5
category: os:interix and Mac OSX 10.4 "Tiger".
category: os:interix,os:darwin
arguments: !-i! arguments: !-i!
env-setup: !ENV=./Env!HISTFILE=hist.file! env-setup: !ENV=./Env!HISTFILE=hist.file!
file-setup: file 644 "Env" file-setup: file 644 "Env"
@ -1899,7 +1900,7 @@ expected-stderr-pattern:
name: history-ed-2-old name: history-ed-2-old
description: description:
Correct command is edited when number given Correct command is edited when number given
category: os:interix category: os:interix,os:darwin
arguments: !-i! arguments: !-i!
env-setup: !ENV=./Env!HISTFILE=hist.file! env-setup: !ENV=./Env!HISTFILE=hist.file!
file-setup: file 644 "Env" file-setup: file 644 "Env"
@ -1930,7 +1931,7 @@ description:
in history. in history.
(NOTE: adjusted for COMPLEX HISTORY compile time option) (NOTE: adjusted for COMPLEX HISTORY compile time option)
(ksh88 fails 'cause it lists the fc command) (ksh88 fails 'cause it lists the fc command)
category: os:interix category: os:interix,os:darwin
arguments: !-i! arguments: !-i!
env-setup: !ENV=./Env!HISTFILE=hist.file! env-setup: !ENV=./Env!HISTFILE=hist.file!
file-setup: file 644 "Env" file-setup: file 644 "Env"
@ -1962,7 +1963,7 @@ description:
Basic (ed) editing works (assumes you have generic ed editor Basic (ed) editing works (assumes you have generic ed editor
that prints no prompts). This is for newish ed(1) and stderr. that prints no prompts). This is for newish ed(1) and stderr.
# we don't have persistent history on Solaris (no flock) # we don't have persistent history on Solaris (no flock)
category: !os:solaris,!os:interix category: !os:solaris,!os:interix,!os:darwin
arguments: !-i! arguments: !-i!
env-setup: !ENV=./Env!HISTFILE=hist.file! env-setup: !ENV=./Env!HISTFILE=hist.file!
file-setup: file 644 "Env" file-setup: file 644 "Env"
@ -1982,7 +1983,7 @@ expected-stderr-pattern:
name: history-ed-2 name: history-ed-2
description: description:
Correct command is edited when number given Correct command is edited when number given
category: !os:solaris,!os:interix category: !os:solaris,!os:interix,!os:darwin
arguments: !-i! arguments: !-i!
env-setup: !ENV=./Env!HISTFILE=hist.file! env-setup: !ENV=./Env!HISTFILE=hist.file!
file-setup: file 644 "Env" file-setup: file 644 "Env"
@ -2009,7 +2010,7 @@ name: history-ed-3
description: description:
Newly created multi line commands show up as single command Newly created multi line commands show up as single command
in history. in history.
category: !os:solaris,!os:interix category: !os:solaris,!os:interix,!os:darwin
arguments: !-i! arguments: !-i!
env-setup: !ENV=./Env!HISTFILE=hist.file! env-setup: !ENV=./Env!HISTFILE=hist.file!
file-setup: file 644 "Env" file-setup: file 644 "Env"