mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-07 12:39:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5800 from orbea/qb

Browse Source 
qb: Used explicit word splitting to silence shellcheck warnings.
This commit is contained in:
Twinaphex 2017-11-27 04:31:51 +01:00 committed by GitHub
commit 0273fe769a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
qb/qb.libs.sh
View File

@ -44,28 +44,25 @@ check_lib() # $1 = language $2 = HAVE_$2 $3 = lib $4 = function in lib $5 =
ECHOBUF="Checking existence of ${3% }" ECHOBUF="Checking existence of ${3% }"
printf %s\\n 'int main(void) { return 0; }' > "$TEMP_CODE" printf %s\\n 'int main(void) { return 0; }' > "$TEMP_CODE"
fi fi
val="$2"
lib="$3"
error="${7:-}"
answer='no' answer='no'
"$COMPILER" -o \ eval "set -- $INCLUDE_DIRS $LIBRARY_DIRS $5 $CFLAGS $LDFLAGS $3"
"$TEMP_EXE" \ "$COMPILER" -o "$TEMP_EXE" "$TEMP_CODE" "$@" >>config.log 2>&1 && answer='yes'
"$TEMP_CODE" \ eval "HAVE_$val=\"$answer\""
$INCLUDE_DIRS \
$LIBRARY_DIRS \
$(printf %s "$5") \
$CFLAGS \
$LDFLAGS \
$(printf %s "$3") >>config.log 2>&1 && answer='yes'
eval "HAVE_$2=\"$answer\""
printf %s\\n "$ECHOBUF ... $answer" printf %s\\n "$ECHOBUF ... $answer"
rm -f -- "$TEMP_CODE" "$TEMP_EXE" rm -f -- "$TEMP_CODE" "$TEMP_EXE"
if [ "$answer" = 'no' ]; then if [ "$answer" = 'no' ]; then
[ "$7" ] && die 1 "$7" [ "$error" ] && die 1 "$error"
[ "$tmpval" = 'yes' ] && { [ "$tmpval" = 'yes' ] && {
die 1 "Forced to build with library $3, but cannot locate. Exiting ..." die 1 "Forced to build with library $lib, but cannot locate. Exiting ..."
} }
else else
eval "${2}_LIBS=\"$3\"" eval "${val}_LIBS=\"$lib\""
PKG_CONF_USED="$PKG_CONF_USED $2" PKG_CONF_USED="$PKG_CONF_USED $val"
fi fi
return 0 return 0
@ -228,9 +225,9 @@ create_config_make()
case "$PKG_CONF_USED" in case "$PKG_CONF_USED" in
*$1*) *$1*)
FLAGS="$(eval "printf %s \"\$$1_CFLAGS\"")" FLAG="$(eval "printf %s \"\$$1_CFLAGS\"")"
LIBS="$(eval "printf %s \"\$$1_LIBS\"")" LIBS="$(eval "printf %s \"\$$1_LIBS\"")"
[ "${FLAGS}" ] && printf %s\\n "$1_CFLAGS = ${FLAGS%"${FLAGS##*[! ]}"}" [ "${FLAG}" ] && printf %s\\n "$1_CFLAGS = ${FLAG%"${FLAG##*[! ]}"}"
[ "${LIBS}" ] && printf %s\\n "$1_LIBS = ${LIBS%"${LIBS##*[! ]}"}" [ "${LIBS}" ] && printf %s\\n "$1_LIBS = ${LIBS%"${LIBS##*[! ]}"}"
;; ;;
esac esac