builddep_funcs.sh: remove unused func, wrap long line.
--HG-- extra : convert_revision : 28a65da6438a2b756be93f7c9d9574aba9d417a2
This commit is contained in:
parent
9c72819434
commit
a1a9d65822
|
@ -104,11 +104,11 @@ install_dependencies_pkg()
|
||||||
msg_normal "Required build dependencies for $pkgname-$lver... "
|
msg_normal "Required build dependencies for $pkgname-$lver... "
|
||||||
for i in ${build_depends}; do
|
for i in ${build_depends}; do
|
||||||
ipkgname=$(${XBPS_PKGDB_CMD} getpkgname ${i})
|
ipkgname=$(${XBPS_PKGDB_CMD} getpkgname ${i})
|
||||||
iversion=$($XBPS_PKGDB_CMD version $ipkgname)
|
ivers=$($XBPS_PKGDB_CMD version $ipkgname)
|
||||||
reqvers=$(${XBPS_PKGDB_CMD} getpkgversion ${i})
|
reqvers=$(${XBPS_PKGDB_CMD} getpkgversion ${i})
|
||||||
check_installed_pkg $i
|
check_installed_pkg $i
|
||||||
if [ $? -eq 0 ]; then
|
if [ $? -eq 0 ]; then
|
||||||
echo " $ipkgname >= $reqvers: found $ipkgname-$iversion."
|
echo " $ipkgname >= $reqvers: found $ipkgname-$ivers."
|
||||||
continue
|
continue
|
||||||
else
|
else
|
||||||
echo " $ipkgname >= $reqvers: not found."
|
echo " $ipkgname >= $reqvers: not found."
|
||||||
|
@ -134,26 +134,6 @@ install_dependencies_pkg()
|
||||||
done
|
done
|
||||||
}
|
}
|
||||||
|
|
||||||
install_builddeps_required_pkg()
|
|
||||||
{
|
|
||||||
local pkg="$1"
|
|
||||||
local pkgname=$(${XBPS_PKGDB_CMD} getpkgname ${pkg})
|
|
||||||
local dep depname
|
|
||||||
|
|
||||||
[ -z "$pkg" ] && return 1
|
|
||||||
|
|
||||||
run_template $pkgname
|
|
||||||
|
|
||||||
for dep in ${build_depends}; do
|
|
||||||
check_installed_pkg $dep
|
|
||||||
if [ $? -ne 0 ]; then
|
|
||||||
msg_normal "Installing $pkgname dependency: $dep."
|
|
||||||
depname=$(${XBPS_PKGDB_CMD} getpkgname ${dep})
|
|
||||||
install_pkg $depname
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
}
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# Checks the registered pkgs db file and returns 0 if a pkg that satisfies
|
# Checks the registered pkgs db file and returns 0 if a pkg that satisfies
|
||||||
# the minimal required version is there, or 1 otherwise.
|
# the minimal required version is there, or 1 otherwise.
|
||||||
|
|
Loading…
Reference in New Issue