Skip to content

Commit 3838ae4

Browse files
committed
[build] new version of Makemore
1 parent 6f4370e commit 3838ae4

File tree

2 files changed

+177
-108
lines changed

2 files changed

+177
-108
lines changed

configure

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ SED=sed
66
MAKE=make
77
DEFCONFIG=defconfig
88
CONFIG=.config
9-
CONFIGURE_STATUS=.config.cache
9+
CONFIGURE_STATUS=.pathcache
1010
out=$CONFIGURE_STATUS
1111

1212
srcdir=$(dirname $(readlink -f $0))/
@@ -51,9 +51,9 @@ function help {
5151
printf "\nFeatures:\n"
5252
for option in $OPTIONS
5353
do
54-
default=$(echo $option | ${SED} 's/_/-/g' | ${SED} 's/=/ /g' | ${AWK} '{print $2}')
54+
default=$(echo $option | ${SED} -e 's/_/-/g' -e 's/=/ /g' -e 's/:.*)/)/' | ${AWK} '{print $2}')
5555
if [ "$default" != "y" -a "$default" != "n" ]; then
56-
with=$(echo $option | ${SED} 's/_/-/g' | ${SED} 's/=/ /g' | ${AWK} '{print "--with-"tolower($1)}')
56+
with=$(echo $option | ${SED} -e 's/_/-/g' -e 's/=/ /g' | ${AWK} '{print "--with-"tolower($1)}')
5757
printf "\t$with=<value>\tdefault:$default\n"
5858
fi
5959
done
@@ -258,7 +258,7 @@ if [ -n "$OPTIONS" ]; then
258258
for option in $OPTIONS
259259
do
260260
name=$(echo ${option} | ${AWK} -F= '{print $1}')
261-
value=$(echo ${option} | ${AWK} -F= '{print $2}')
261+
value=$(echo ${option} | ${SED} "s/$name*=//")
262262
found=$(echo $ENABLEOPTIONS | grep -w $name)
263263
if [ x"$found" != x"" ]; then
264264
value=y
@@ -271,7 +271,7 @@ if [ -n "$OPTIONS" ]; then
271271
if [ x"$found" != x"" ]; then
272272
value=${!name}
273273
fi
274-
printf " $name:\t$value\n"
274+
printf " $name:\t$value\n" 2> /dev/null
275275
echo $name=$value >> ${builddir}${CONFIG}
276276
done
277277
else
@@ -295,7 +295,7 @@ fi
295295

296296
printf "\nDependencies checking:\n"
297297
if [ "$check" != "disable" ]; then
298-
${MAKE} BUILDDIR=${builddir} -C${srcdir} check 2> /dev/null
298+
${MAKE} --no-print-directory BUILDDIR=${builddir} -C${srcdir} check
299299
if [ $? != 0 ]; then
300300
echo "binary dependencies failed"
301301
exit -1

0 commit comments

Comments
 (0)