Browse Source

Fix s3.TUP library version detection (v0.10.5)

detection of updated/installed libraries now works properly after build
pull/15/head
WXbet 5 years ago
parent
commit
92bd86139c
  1. 7
      support/functions/_plugin_update_toolchain

7
support/functions/_plugin_update_toolchain

@ -3,7 +3,7 @@
#simplebuild_plugin tcupdate #simplebuild_plugin tcupdate
tcupdate(){ tcupdate(){
pversion="0.10.5"; pversion="0.10.6";
pname="s3.TUP"; pname="s3.TUP";
pdesc="Plugin $pname v$pversion"; pdesc="Plugin $pname v$pversion";
configname="$configdir/plugin_update_toolchain.config"; configname="$configdir/plugin_update_toolchain.config";
@ -119,7 +119,7 @@ tcupdate(){
[ -f "$tccfgdir/$tc" ] && source "$tccfgdir/$tc"; [ -f "$tccfgdir/$tc" ] && source "$tccfgdir/$tc";
cd "$tcdir/$tc/bin"; cd "$tcdir/$tc/bin";
#autodetect toolchain's sysroot, prefix, include, pkgconfig folder #autodetect toolchain's sysroot, prefix, include
compilername="$_compiler""gcc";compilername=$(realpath -s $compilername); compilername="$_compiler""gcc";compilername=$(realpath -s $compilername);
ranlibname="$_compiler""ranlib";ranlibname=$(realpath -s $ranlibname); ranlibname="$_compiler""ranlib";ranlibname=$(realpath -s $ranlibname);
hostname=${_compiler%?}; hostname=${_compiler%?};
@ -133,12 +133,13 @@ tcupdate(){
cd "$tcdir/$tc/$_sysroot" cd "$tcdir/$tc/$_sysroot"
fi; fi;
prefixdir="$PWD" prefixdir="$PWD"
pkg=$(find * | grep -m1 "/pkgconfig") && pkgdir="$prefixdir/$pkg" || pkgdir="$prefixdir";
[ "$FLAG" == "1" ] && backxit=1 || backxit=$menu_close; [ "$FLAG" == "1" ] && backxit=1 || backxit=$menu_close;
unset menu_close; unset menu_close;
while [ ! $menu_close ] while [ ! $menu_close ]
do do
#autodetect toolchain's pkgconfig folder
pkg=$(find * | grep -m1 "/pkgconfig") && pkgdir="$prefixdir/$pkg" || pkgdir="$prefixdir";
cd "$prefixdir" cd "$prefixdir"
#LIBRARY UPDATE MENU #LIBRARY UPDATE MENU
unset MENU_OPTIONS;COUNT=0;unset libs; unset MENU_OPTIONS;COUNT=0;unset libs;

Loading…
Cancel
Save