Browse Source

s3.TUP Better library detection (v0.22.5)

- update library detection to correctly recognize libraries when more than one library is  configured with the same version major and minor
pull/61/head
WXbet 4 years ago
parent
commit
c0c725d6e5
  1. 4
      support/functions/_plugin_update_toolchain

4
support/functions/_plugin_update_toolchain

@ -3,7 +3,7 @@
#simplebuild_plugin tcupdate
tcupdate(){
pversion="0.22.4";
pversion="0.22.5";
pname="s3.TUP";
pdesc="Plugin $pname v$pversion";
configname="$configdir/plugin_update_toolchain.config";
@ -971,7 +971,7 @@ _get_toolchain_libs(){
libchecklib="$key"_checklib;libchecklib="${!libchecklib}";
libversion="$key"_version;libversion="${!libversion}";
libversioncompare=$(_compare_version $libversion $version);
if [[ "$pkg $version" =~ ^${libcheck}.* ]];then #regex match, don't quote the right side
if [[ "$pkg $version" =~ ^${libcheck}.* ]] || [[ "$pkg $version" =~ ^${libcheck::-2}.* ]];then #regex match, don't quote the right side
if [ -n "$libchecklib" -a -f "$pkgconfigdir/../$libchecklib" -o -z "$libchecklib" ];then
libs+="$pkg\|$version\|$key\|$libversion\|$libversioncompare\|$name;";
break;

Loading…
Cancel
Save