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

if LDSTATIC is not empty (i.e. "-static" or " "), always add “our” sources: 

• strlcpy
• utf_wcwidth
note strchr/strstr from misc.c are still #ifdef DEBUG only, as they are
not eligible: they’re for const-cleanliness debugging purposes

XXX get rid of multiple occurrences of binary search code, too…
This commit is contained in:
tg 2012-04-06 15:20:42 +00:00
parent 8ac32ba793
commit 3d3081115b
2 changed files with 19 additions and 5 deletions
Show Stats 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
srcversion='$MirOS: src/bin/mksh/Build.sh,v 1.540 2012/04/06 15:03:42 tg Exp $' srcversion='$MirOS: src/bin/mksh/Build.sh,v 1.541 2012/04/06 15:20:41 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
@ -276,6 +276,12 @@ ac_header() {
} }
addsrcs() { addsrcs() {
addsrcs_s=0
if test x"$1" = x"-s"; then
# optstatic
addsrcs_s=1
shift
fi
if test x"$1" = x"!"; then if test x"$1" = x"!"; then
fr=0 fr=0
shift shift
@ -283,6 +289,13 @@ addsrcs() {
fr=1 fr=1
fi fi
eval i=\$$1 eval i=\$$1
if test $addsrcs_s = 1; then
if test -f "$2" || test -f "$srcdir/$2"; then
# always add $2, since it exists
fr=1
i=1
fi
fi
test $fr = "$i" && case " $SRCS " in test $fr = "$i" && case " $SRCS " in
*\ $2\ *) ;; *\ $2\ *) ;;
*) SRCS="$SRCS $2" ;; *) SRCS="$SRCS $2" ;;
@ -1376,7 +1389,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.540 2012/04/06 15:03:42 tg Exp $"); __RCSID("$MirOS: src/bin/mksh/Build.sh,v 1.541 2012/04/06 15:20:41 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
@ -1804,10 +1817,11 @@ mksh_cfg= NSIG
$e done. $e done.
fi fi
addsrcs '!' HAVE_STRLCPY strlcpy.c addsrcs -s '!' HAVE_STRLCPY strlcpy.c
addsrcs USE_PRINTF_BUILTIN printf.c addsrcs USE_PRINTF_BUILTIN printf.c
test 1 = "$USE_PRINTF_BUILTIN" && add_cppflags -DMKSH_PRINTF_BUILTIN test 1 = "$USE_PRINTF_BUILTIN" && add_cppflags -DMKSH_PRINTF_BUILTIN
test 1 = "$HAVE_CAN_VERB" && CFLAGS="$CFLAGS -verbose" test 1 = "$HAVE_CAN_VERB" && CFLAGS="$CFLAGS -verbose"
test -n "$LDSTATIC" && add_cppflags -DMKSH_OPTSTATIC
add_cppflags -DMKSH_BUILD_R=409 add_cppflags -DMKSH_BUILD_R=409
$e $bi$me: Finished configuration testing, now producing output.$ao $e $bi$me: Finished configuration testing, now producing output.$ao

4
sh.h
View File

@ -152,7 +152,7 @@
#endif #endif
#ifdef EXTERN #ifdef EXTERN
__RCSID("$MirOS: src/bin/mksh/sh.h,v 1.542 2012/04/06 13:29:01 tg Exp $"); __RCSID("$MirOS: src/bin/mksh/sh.h,v 1.543 2012/04/06 15:20:42 tg Exp $");
#endif #endif
#define MKSH_VERSION "R40 2012/03/29" #define MKSH_VERSION "R40 2012/03/29"
@ -343,7 +343,7 @@ extern int __cdecl setegid(gid_t);
/* remove redundances */ /* remove redundances */
#if defined(MirBSD) && (MirBSD >= 0x08A8) #if defined(MirBSD) && (MirBSD >= 0x08A8) && !defined(MKSH_OPTSTATIC)
#define MKSH_mirbsd_wcwidth #define MKSH_mirbsd_wcwidth
#define utf_wcwidth(i) wcwidth((__WCHAR_TYPE__)i) #define utf_wcwidth(i) wcwidth((__WCHAR_TYPE__)i)
extern int wcwidth(__WCHAR_TYPE__); extern int wcwidth(__WCHAR_TYPE__);