Merge pull request #5757 from orbea/config.mk

qb: Rewrite the create_config_make function to use printf instead of echo
This commit is contained in:
Twinaphex 2017-11-23 22:10:48 +01:00 committed by GitHub
commit b16f22b357
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -214,46 +214,46 @@ create_config_header()
create_config_make() create_config_make()
{ outfile="$1"; shift { outfile="$1"; shift
echo "Creating make config: $outfile" printf %s\\n "Creating make config: $outfile"
{ if [ "$USE_LANG_C" = 'yes' ]; then { [ "$USE_LANG_C" = 'yes' ] && printf %s\\n "CC = $CC" "CFLAGS = $CFLAGS"
echo "CC = $CC" [ "$USE_LANG_CXX" = 'yes' ] && printf %s\\n "CXX = $CXX" "CXXFLAGS = $CXXFLAGS"
echo "CFLAGS = $CFLAGS"
fi printf %s\\n "WINDRES = $WINDRES" \
if [ "$USE_LANG_CXX" = 'yes' ]; then "ASFLAGS = $ASFLAGS" \
echo "CXX = $CXX" "LDFLAGS = $LDFLAGS" \
echo "CXXFLAGS = $CXXFLAGS" "INCLUDE_DIRS = $INCLUDE_DIRS" \
fi "LIBRARY_DIRS = $LIBRARY_DIRS" \
echo "WINDRES = $WINDRES" "PACKAGE_NAME = $PACKAGE_NAME" \
echo "ASFLAGS = $ASFLAGS" "BUILD = $BUILD" \
echo "LDFLAGS = $LDFLAGS" "PREFIX = $PREFIX"
echo "INCLUDE_DIRS = $INCLUDE_DIRS"
echo "LIBRARY_DIRS = $LIBRARY_DIRS"
echo "PACKAGE_NAME = $PACKAGE_NAME"
echo "BUILD = $BUILD"
echo "PREFIX = $PREFIX"
while [ "$1" ]; do while [ "$1" ]; do
case $(eval echo \$HAVE_$1) in case "$(eval "printf %s \"\$HAVE_$1\"")" in
'yes') 'yes')
if [ "$(eval echo \$C89_$1)" = "no" ]; then echo "ifneq (\$(C89_BUILD),1)"; fi if [ "$(eval "printf %s \"\$C89_$1\"")" = 'no' ]; then
echo "HAVE_$1 = 1" printf %s\\n "ifneq (\$(C89_BUILD),1)" \
if [ "$(eval echo \$C89_$1)" = "no" ]; then echo "endif"; fi "HAVE_$1 = 1" 'endif'
;; else
'no') echo "HAVE_$1 = 0";; printf %s\\n "HAVE_$1 = 1"
fi
;;
'no') printf %s\\n "HAVE_$1 = 0";;
esac esac
case "$PKG_CONF_USED" in case "$PKG_CONF_USED" in
*$1*) *$1*)
FLAGS="$(eval echo \$$1_CFLAGS)" FLAGS="$(eval "printf %s \"\$$1_CFLAGS\"")"
LIBS="$(eval echo \$$1_LIBS)" LIBS="$(eval "printf %s \"\$$1_LIBS\"")"
echo "$1_CFLAGS = ${FLAGS%"${FLAGS##*[! ]}"}" printf %s\\n "$1_CFLAGS = ${FLAGS%"${FLAGS##*[! ]}"}" \
echo "$1_LIBS = ${LIBS%"${LIBS##*[! ]}"}" "$1_LIBS = ${LIBS%"${LIBS##*[! ]}"}"
;; ;;
esac esac
shift shift
done done
while IFS='=' read VAR VAL; do echo "$VAR = $VAL"; done < "$MAKEFILE_DEFINES" while IFS='=' read -r VAR VAL; do
printf %s\\n "$VAR = $VAL"
done < "$MAKEFILE_DEFINES"
} > "$outfile" } > "$outfile"
} }