diff options
author | Michael Cahill <michael.cahill@wiredtiger.com> | 2013-07-09 16:19:40 +1000 |
---|---|---|
committer | Michael Cahill <michael.cahill@wiredtiger.com> | 2013-07-09 16:19:40 +1000 |
commit | 460792842a75ef4349ec25e677cd6295acf30cac (patch) | |
tree | 094a9ea517451906867eba4b283d16a379b60956 | |
parent | 4040f54345bd2251934e17d4af8c47c19d58a091 (diff) | |
download | mongo-460792842a75ef4349ec25e677cd6295acf30cac.tar.gz |
Another try at portably getting the IFS setting we need.
-rwxr-xr-x | build_posix/makemake | 1 | ||||
-rwxr-xr-x | build_posix/reconf | 6 | ||||
-rw-r--r-- | dist/s_typedef | 6 |
3 files changed, 9 insertions, 4 deletions
diff --git a/build_posix/makemake b/build_posix/makemake index d36810870fe..44d5571e279 100755 --- a/build_posix/makemake +++ b/build_posix/makemake @@ -7,7 +7,6 @@ (sed -n '1,/BEGIN SUBDIRS/p' Make.base echo "SUBDIRS = ." -IFS=$(printf ' \t\n') sed -e 's/#.*$//' -e '/^$/d' Make.subdirs | (while read dir cond ; do test -d ../$dir || continue if test -n "$cond" ; then diff --git a/build_posix/reconf b/build_posix/reconf index 6e9912d7987..4087c41bf25 100755 --- a/build_posix/reconf +++ b/build_posix/reconf @@ -3,6 +3,11 @@ t=/tmp/__configure.$$ trap 'rm -f $t; exit 0' 0 1 2 3 13 15 +# Insulate against IFS from the user's env +IFS=' '' '' +' +export IFS + # Allow this script to be run from anywhere cd "`dirname \"$0\"`" @@ -32,7 +37,6 @@ echo "# This file is built automatically from build_posix/configure.ac.in." sed -n '1,/BEGIN check existence/p' configure.ac.in -IFS=$(printf ' \t\n') sed -e 's/#.*$//' -e '/^$/d' Make.subdirs | while read dir cond ; do test -d ../$dir || continue echo 'AC_CONFIG_FILES(['$dir/Makefile'])' diff --git a/dist/s_typedef b/dist/s_typedef index d11fd440232..067ae7b93a9 100644 --- a/dist/s_typedef +++ b/dist/s_typedef @@ -3,9 +3,12 @@ t=__wt.$$ trap 'rm -f $t; exit 0' 0 1 2 3 13 15 -# Insulate against locale-specific sort order +# Insulate against locale-specific sort order and IFS from the user's env LC_ALL=C export LC_ALL +IFS=' '' '' +' +export IFS build() { # Build the standard typedefs. @@ -15,7 +18,6 @@ build() { -e 'q' \ -e '}' < $f - IFS=$(printf ' \t\n') l=`ls ../src/include/*.[hi] ../src/include/*.in | sed -e '/wiredtiger.*/d' -e '/queue.h/d'` egrep -h '^[ ]*(enum|struct|union)[ ]*__.*[ ]*{$' $l | \ |