mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-03 04:14:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1643 from heuripedes/master

Browse Source 
(qb) Do not abort on missing pkg-config under Darwin
This commit is contained in:
Twinaphex 2015-04-19 15:24:31 +02:00
commit 2d6f89eb68
2 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
qb/qb.comp.sh
View File

@ -78,3 +78,20 @@ if [ "$OS" = "Win32" ]; then
fi
echo "$ECHOBUF ... $WINDRES"
fi
[ "$PKG_CONF_PATH" ] && [ "$PKG_CONF_PATH" != "none" ] || {
ECHOBUF="Checking for pkg-config"
PKG_CONF_PATH="none"
for path in $(which "${CROSS_COMPILE}pkg-config" 2>/dev/null) ''; do
[ -n "$path" ] && {
PKG_CONF_PATH=$path;
break;
}
done
echo "$ECHOBUF ... $PKG_CONF_PATH"
if [ "$PKG_CONF_PATH" = "none" ]; then
echo "Warning: pkg-config not found, package checks will fail."
fi
}

15
qb/qb.libs.sh
View File

@ -104,17 +104,14 @@ check_pkgconf() #$1 = HAVE_$1 $2 = package $3 = version $4 = critical error mess
{ tmpval="$(eval echo \$HAVE_$1)"
[ "$tmpval" = 'no' ] && return 0
[ "$PKG_CONF_PATH" ] || {
ECHOBUF="Checking for pkg-config"
# echo -n "Checking for pkg-config"
for PKG_CONF_PATH in $(which "${CROSS_COMPILE}pkg-config") ''; do [ "$PKG_CONF_PATH" ] && break; done
[ "$PKG_CONF_PATH" ] || { echo "pkg-config not found. Exiting ..."; exit 1;}
echo "$ECHOBUF ... $PKG_CONF_PATH"
}
ECHOBUF="Checking presence of package $2"
[ "$3" ] && ECHOBUF="$ECHOBUF >= $3"
# echo -n "$ECHOBUF ... "
[ "$PKG_CONF_PATH" = "none" ] && {
echo "$ECHOBUF ... no"
return 0
}
answer='no'
version='no'
$PKG_CONF_PATH --atleast-version="${3:-0.0}" "$2" && {