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

add a little portability

Browse Source
This commit is contained in:
tg
2006-06-23 15:05:39 +00:00
parent ab231f3595
commit fc87ecb1dd
2 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Build.sh
View File

@@ -1,5 +1,5 @@
#!/bin/sh #!/bin/sh
# $MirOS: src/bin/mksh/Build.sh,v 1.29 2006/05/27 20:33:01 tg Exp $ # $MirOS: src/bin/mksh/Build.sh,v 1.30 2006/06/23 15:05:39 tg Exp $
#- #-
# This script recognises CC, CFLAGS, CPPFLAGS, LDFLAGS, LIBS and NROFF. # This script recognises CC, CFLAGS, CPPFLAGS, LDFLAGS, LIBS and NROFF.
@@ -9,14 +9,14 @@ case $SHELL in
esac esac
CC="${CC:-gcc}" CC="${CC:-gcc}"
CFLAGS="${CFLAGS--O2 -fno-strict-aliasing -fno-strength-reduce -Wall}" CFLAGS="${CFLAGS--O2 -fno-strict-aliasing -fno-strength-reduce -Wall}"
export SHELL CC export SHELL
srcdir="${srcdir:-`dirname "$0"`}" srcdir="${srcdir:-`dirname "$0"`}"
curdir="`pwd`" curdir="`pwd`"
e=echo e=echo
q=0 q=0
r=0 r=0
LDSTATIC=-static x=0
while [ -n "$1" ]; do while [ -n "$1" ]; do
case $1 in case $1 in
@@ -30,6 +30,9 @@ while [ -n "$1" ]; do
-r) -r)
r=1 r=1
;; ;;
-x)
x=1
;;
*) *)
echo "$0: Unknown option '$1'!" >&2 echo "$0: Unknown option '$1'!" >&2
exit 1 exit 1
@@ -41,13 +44,15 @@ done
v() v()
{ {
$e "$*" $e "$*"
eval "$*" eval "$@"
} }
SRCS="alloc.c edit.c eval.c exec.c expr.c funcs.c histrap.c" [ $x = 1 ] || LDSTATIC=-static
[ $x = 1 ] || SRCS=
SRCS="alloc.c edit.c eval.c exec.c expr.c funcs.c histrap.c $SRCS"
SRCS="$SRCS jobs.c lex.c main.c misc.c shf.c syn.c tree.c var.c" SRCS="$SRCS jobs.c lex.c main.c misc.c shf.c syn.c tree.c var.c"
case "`uname -s 2>/dev/null || uname`" in [ $x = 1 ] || case "`uname -s 2>/dev/null || uname`" in
Darwin) Darwin)
LDSTATIC= # never works LDSTATIC= # never works
CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=64" CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=64"
@@ -72,6 +77,7 @@ SunOS)
;; ;;
esac esac
export CC CPPFLAGS
v $SHELL "'$srcdir/gensigs.sh'" || exit 1 v $SHELL "'$srcdir/gensigs.sh'" || exit 1
(v "cd '$srcdir' && exec $CC $CFLAGS -I'$curdir' $CPPFLAGS" \ (v "cd '$srcdir' && exec $CC $CFLAGS -I'$curdir' $CPPFLAGS" \
"$LDFLAGS $LDSTATIC -o '$curdir/mksh' $SRCS $LIBS") || exit 1 "$LDFLAGS $LDSTATIC -o '$curdir/mksh' $SRCS $LIBS") || exit 1
@@ -81,7 +87,7 @@ test -x mksh || exit 1
[ $q = 1 ] || v size mksh [ $q = 1 ] || v size mksh
echo '#!/bin/sh' >Test.sh echo '#!/bin/sh' >Test.sh
echo "exec perl '$srcdir/check.pl' -s '$srcdir/check.t' -p '$curdir/mksh' -C pdksh" >>Test.sh echo "exec perl '$srcdir/check.pl' -s '$srcdir/check.t' -p '$curdir/mksh' -C pdksh" >>Test.sh
chmod 555 Test.sh chmod 755 Test.sh
$e $e
$e To test mirbsdksh, execute ./Test.sh $e To test mirbsdksh, execute ./Test.sh
$e $e

6
gensigs.sh
View File

@@ -1,11 +1,11 @@
#!/bin/sh #!/bin/sh
# $MirOS: src/bin/mksh/gensigs.sh,v 1.2 2005/05/23 12:06:39 tg Exp $ # $MirOS: src/bin/mksh/gensigs.sh,v 1.3 2006/06/23 15:05:39 tg Exp $
echo '#include <signal.h>' | $CC -E -dD -D_ANSI_SOURCE - \ echo '#include <signal.h>' | $CC $CPPFLAGS -E -dD -D_ANSI_SOURCE - \
| grep '[ ]SIG[A-Z0-9]*[ ]' \ | grep '[ ]SIG[A-Z0-9]*[ ]' \
| sed 's/^\(.*[ ]SIG\)\([A-Z0-9]*\)\([ ].*\)$/\2/' \ | sed 's/^\(.*[ ]SIG\)\([A-Z0-9]*\)\([ ].*\)$/\2/' \
| while read name; do | while read name; do
( echo '#include <signal.h>'; echo "__mksh_test: SIG$name" ) \ ( echo '#include <signal.h>'; echo "__mksh_test: SIG$name" ) \
| $CC -E - | fgrep __mksh_test: | sed \ | $CC $CPPFLAGS -E - | fgrep __mksh_test: | sed \
's/^__mksh_test: \([0-9]*\).*$/ { \1, "'$name'" },/' 's/^__mksh_test: \([0-9]*\).*$/ { \1, "'$name'" },/'
done | fgrep -v '{ ,' >signames.inc done | fgrep -v '{ ,' >signames.inc