moritzruth/void-packages
1
0
Fork 0
Code Releases Activity Actions 2

xbps-src: verify_rundeps: set tmplf once.

Browse source
This commit is contained in:
Juan RP 2011-11-12 11:33:40 +01:00
parent 0c04077f6a
commit badcea5e8c
1 changed files with 6 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

17
xbps-src/shutils/verify_rundeps.sh
View file

@ -44,7 +44,7 @@ find_rundep()
verify_rundeps() verify_rundeps()
{ {
local j f nlib verify_deps maplib found_dup igndir local j f nlib verify_deps maplib found_dup igndir
local broken rdep found rsonamef soname_list revbumped local broken rdep found rsonamef soname_list revbumped tmplf
maplib="$XBPS_COMMONVARSDIR/mapping_shlib_binpkg.txt" maplib="$XBPS_COMMONVARSDIR/mapping_shlib_binpkg.txt"
@ -90,6 +90,11 @@ verify_rundeps()
exec 0<&3 # restore stdin exec 0<&3 # restore stdin
rm -f $depsftmp rm -f $depsftmp
if [ -f $XBPS_SRCPKGDIR/$pkgname/$pkgname.template ]; then
tmplf=$XBPS_SRCPKGDIR/$pkgname/$pkgname.template
else
tmplf=$XBPS_SRCPKGDIR/$pkgname/template
fi
# #
# Add required run time packages by using required shlibs resolved # Add required run time packages by using required shlibs resolved
# above, the mapping is done thru the mapping_shlib_binpkg.txt file. # above, the mapping is done thru the mapping_shlib_binpkg.txt file.
@ -124,11 +129,6 @@ verify_rundeps()
soname_list="${soname_list} ${f}" soname_list="${soname_list} ${f}"
fi fi
# Try to remove the line from template # Try to remove the line from template
if [ -f $XBPS_SRCPKGDIR/$pkgname/$pkgname.template ]; then
tmplf=$XBPS_SRCPKGDIR/$pkgname/$pkgname.template
else
tmplf=$XBPS_SRCPKGDIR/$pkgname/template
fi
sed -i -r "/^Add_dependency run ${_rdep}([[:space:]]+\".*\")*$/d" $tmplf sed -i -r "/^Add_dependency run ${_rdep}([[:space:]]+\".*\")*$/d" $tmplf
if find_rundep ${_rdep}; then if find_rundep ${_rdep}; then
Add_dependency run ${_rdep} Add_dependency run ${_rdep}
@ -188,11 +188,6 @@ verify_rundeps()
if [ -n "$broken" ]; then if [ -n "$broken" ]; then
msg_warn "$pkgver: shlibs changed... package has been revbumped!\n" msg_warn "$pkgver: shlibs changed... package has been revbumped!\n"
if [ -f $XBPS_SRCPKGDIR/$pkgname/$pkgname.template ]; then
tmplf=$XBPS_SRCPKGDIR/$pkgname/$pkgname.template
else
tmplf=$XBPS_SRCPKGDIR/$pkgname/template
fi
_rev=$(egrep '^revision=.*' $tmplf) _rev=$(egrep '^revision=.*' $tmplf)
if [ -n "${_rev}" ]; then if [ -n "${_rev}" ]; then
newrev=$((${_rev#revision=} + 1)) newrev=$((${_rev#revision=} + 1))