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

ac_test for MKSH_SMALL presence in CPPFLAGS

Browse Source 
if present, don't even look for setmode as it's only used by mknod builtin
This commit is contained in:
tg
2006-11-09 22:51:49 +00:00
parent 68caa9afdd
commit a48a880c00
2 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
Build.sh
View File

@@ -1,5 +1,5 @@
#!/bin/sh #!/bin/sh
# $MirOS: src/bin/mksh/Build.sh,v 1.68 2006/11/09 15:02:30 tg Exp $ # $MirOS: src/bin/mksh/Build.sh,v 1.69 2006/11/09 22:51:49 tg Exp $
#- #-
# Environment: CC, CFLAGS, CPPFLAGS, LDFLAGS, LIBS, NROFF # Environment: CC, CFLAGS, CPPFLAGS, LDFLAGS, LIBS, NROFF
@@ -18,8 +18,6 @@ ac_test()
{ {
f=$1 f=$1
fu=`upper $f` fu=`upper $f`
fd=$3
test x"$fd" = x"" && fd=$f
test 0 = "$HAVE_$fu" && return test 0 = "$HAVE_$fu" && return
test 1 = "$HAVE_$fu" && return test 1 = "$HAVE_$fu" && return
if test x"$2" = x""; then if test x"$2" = x""; then
@@ -27,10 +25,14 @@ ac_test()
else else
ft=`upper $2` ft=`upper $2`
eval ft=\$HAVE_$ft eval ft=\$HAVE_$ft
shift
fi fi
fd=$3
test x"$fd" = x"" && fd=$f
if test 0 = "$ft"; then if test 0 = "$ft"; then
eval HAVE_$fu=0 CPPFLAGS=\"\$CPPFLAGS -DHAVE_$fu=0\" eval HAVE_$fu=$2
$e "==> $fd... no" eval CPPFLAGS=\"\$CPPFLAGS -DHAVE_$fu=$2\"
$e "==> $fd... not checked ($2)"
return return
fi fi
$e ... $fd $e ... $fd
@@ -157,12 +159,20 @@ fi
$e Scanning for functions... please ignore any errors. $e Scanning for functions... please ignore any errors.
ac_test mksh_full '' "if we're building without MKSH_SMALL" <<-'EOF'
#ifdef MKSH_SMALL
#error OK, we're building an extra small mksh.
#else
int main(void) { return (0); }
#endif
EOF
ac_test arc4random <<-'EOF' ac_test arc4random <<-'EOF'
#include <stdlib.h> #include <stdlib.h>
int main(void) { arc4random(); return (0); } int main(void) { arc4random(); return (0); }
EOF EOF
ac_test arc4random_push arc4random <<-'EOF' ac_test arc4random_push arc4random 0 <<-'EOF'
#include <stdlib.h> #include <stdlib.h>
int main(void) { arc4random_push(1); return (0); } int main(void) { arc4random_push(1); return (0); }
EOF EOF
@@ -172,12 +182,12 @@ ac_test setlocale_ctype '' 'setlocale(LC_CTYPE, "")' <<'EOF'
int main(void) { setlocale(LC_CTYPE, ""); return (0); } int main(void) { setlocale(LC_CTYPE, ""); return (0); }
EOF EOF
ac_test langinfo_codeset setlocale_ctype 'nl_langinfo(CODESET)' <<'EOF' ac_test langinfo_codeset setlocale_ctype 0 'nl_langinfo(CODESET)' <<'EOF'
#include <langinfo.h> #include <langinfo.h>
int main(void) { nl_langinfo(CODESET); return (0); } int main(void) { nl_langinfo(CODESET); return (0); }
EOF EOF
ac_test setmode <<-'EOF' ac_test setmode mksh_full 1 <<-'EOF'
#include <unistd.h> #include <unistd.h>
int main(int ac, char *av[]) { setmode(av[0]); return (ac); } int main(int ac, char *av[]) { setmode(av[0]); return (ac); }
EOF EOF

6
setmode.c
View File

@@ -1,5 +1,4 @@
/** $MirOS: src/bin/mksh/setmode.c,v 1.5 2006/11/09 22:18:10 tg Exp $ */ /** $MirOS: src/bin/mksh/setmode.c,v 1.6 2006/11/09 22:51:49 tg Exp $ */
#ifndef MKSH_SMALL
/** _MirOS: src/lib/libc/gen/setmode.c,v 1.6 2006/11/08 23:18:04 tg Exp $ */ /** _MirOS: src/lib/libc/gen/setmode.c,v 1.6 2006/11/08 23:18:04 tg Exp $ */
/* $OpenBSD: setmode.c,v 1.17 2005/08/08 08:05:34 espie Exp $ */ /* $OpenBSD: setmode.c,v 1.17 2005/08/08 08:05:34 espie Exp $ */
/* $NetBSD: setmode.c,v 1.15 1997/02/07 22:21:06 christos Exp $ */ /* $NetBSD: setmode.c,v 1.15 1997/02/07 22:21:06 christos Exp $ */
@@ -59,7 +58,7 @@
#endif #endif
__SCCSID("@(#)setmode.c 8.2 (Berkeley) 3/25/94"); __SCCSID("@(#)setmode.c 8.2 (Berkeley) 3/25/94");
__RCSID("$MirOS: src/bin/mksh/setmode.c,v 1.5 2006/11/09 22:18:10 tg Exp $"); __RCSID("$MirOS: src/bin/mksh/setmode.c,v 1.6 2006/11/09 22:51:49 tg Exp $");
#define SET_LEN 6 /* initial # of bitcmd struct to malloc */ #define SET_LEN 6 /* initial # of bitcmd struct to malloc */
#define SET_LEN_INCR 4 /* # of bitcmd structs to add as needed */ #define SET_LEN_INCR 4 /* # of bitcmd structs to add as needed */
@@ -463,4 +462,3 @@ compress_mode(BITCMD *set)
} }
} }
} }
#endif