snailed
/
void-packages
2
0
Fork 0
Code Issues 1 Pull Requests 1 Actions Activity

xbps-src: add back support for 32bit dependencies

This commit is contained in:
Duncaen 2019-09-29 19:15:44 +02:00 committed by Juan RP
parent e450363b00
commit 581ee5b7b2
1 changed files with 50 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
common/xbps-src/shutils/build_dependencies.sh
View File

@ -123,6 +123,7 @@ install_pkg_deps() {
local pkg="$1" targetpkg="$2" target="$3" cross="$4" cross_prepare="$5" local pkg="$1" targetpkg="$2" target="$3" cross="$4" cross_prepare="$5"
local _vpkg curpkgdepname local _vpkg curpkgdepname
local i j found style local i j found style
local templates=""
local -a host_binpkg_deps binpkg_deps local -a host_binpkg_deps binpkg_deps
local -a host_missing_deps missing_deps missing_rdeps local -a host_missing_deps missing_deps missing_rdeps
@ -145,11 +146,20 @@ install_pkg_deps() {
# Host build dependencies. # Host build dependencies.
# #
if [[ ${hostmakedepends} ]]; then if [[ ${hostmakedepends} ]]; then
templates=""
# check validity # check validity
for f in ${hostmakedepends}; do for f in ${hostmakedepends}; do
if [ ! -f $XBPS_SRCPKGDIR/$f/template ]; then if [ -f $XBPS_SRCPKGDIR/$f/template ]; then
msg_error "$pkgver: host dependency '$f' does not exist!\n" templates+=" $f"
continue
fi fi
local _repourl=$($XBPS_QUERY_CMD -R -prepository "$f" 2>/dev/null)
if [ "$_repourl" ]; then
echo " [host] ${f}: found (${_repourl})"
host_binpkg_deps+=("$f")
continue
fi
msg_error "$pkgver: host dependency '$f' does not exist!\n"
done done
while read -r _depname _deprepover _depver _subpkg _repourl; do while read -r _depname _deprepover _depver _subpkg _repourl; do
_vpkg=${_subpkg}-${_depver} _vpkg=${_subpkg}-${_depver}
@ -179,18 +189,27 @@ install_pkg_deps() {
echo " [host] ${_vpkg}: not found" echo " [host] ${_vpkg}: not found"
host_missing_deps+=("$_vpkg") host_missing_deps+=("$_vpkg")
fi fi
done < <($XBPS_CHECKVERS_CMD ${XBPS_SKIP_REMOTEREPOS:+-i} -D $XBPS_DISTDIR -sm ${hostmakedepends}) done < <($XBPS_CHECKVERS_CMD ${XBPS_SKIP_REMOTEREPOS:+-i} -D $XBPS_DISTDIR -sm $templates)
fi fi
# #
# Host check dependencies. # Host check dependencies.
# #
if [[ ${checkdepends} ]] && [[ $XBPS_CHECK_PKGS ]]; then if [[ ${checkdepends} ]] && [[ $XBPS_CHECK_PKGS ]]; then
templates=""
# check validity # check validity
for f in ${checkdepends}; do for f in ${checkdepends}; do
if [ ! -f $XBPS_SRCPKGDIR/$f/template ]; then if [ -f $XBPS_SRCPKGDIR/$f/template ]; then
msg_error "$pkgver: check dependency '$f' does not exist!\n" templates+=" $f"
continue
fi fi
local _repourl=$($XBPS_QUERY_CMD -R -prepository "$f" 2>/dev/null)
if [ "$_repourl" ]; then
echo " [host] ${f}: found (${_repourl})"
host_binpkg_deps+=("$f")
continue
fi
msg_error "$pkgver: check dependency '$f' does not exist!\n"
done done
while read -r _depname _deprepover _depver _subpkg _repourl; do while read -r _depname _deprepover _depver _subpkg _repourl; do
_vpkg=${_subpkg}-${_depver} _vpkg=${_subpkg}-${_depver}
@ -220,18 +239,27 @@ install_pkg_deps() {
echo " [check] ${_vpkg}: not found" echo " [check] ${_vpkg}: not found"
host_missing_deps+=("$_vpkg") host_missing_deps+=("$_vpkg")
fi fi
done < <($XBPS_CHECKVERS_CMD ${XBPS_SKIP_REMOTEREPOS:+-i} -D $XBPS_DISTDIR -sm ${checkdepends}) done < <($XBPS_CHECKVERS_CMD ${XBPS_SKIP_REMOTEREPOS:+-i} -D $XBPS_DISTDIR -sm ${templates})
fi fi
# #
# Target build dependencies. # Target build dependencies.
# #
if [[ ${makedepends} ]]; then if [[ ${makedepends} ]]; then
templates=""
# check validity # check validity
for f in ${makedepends}; do for f in ${makedepends}; do
if [ ! -f $XBPS_SRCPKGDIR/$f/template ]; then if [ -f $XBPS_SRCPKGDIR/$f/template ]; then
msg_error "$pkgver: target dependency '$f' does not exist!\n" templates+=" $f"
continue
fi fi
local _repourl=$($XBPS_QUERY_CMD -R -prepository "$f" 2>/dev/null)
if [ "$_repourl" ]; then
echo " [target] ${f}: found (${_repourl})"
binpkg_deps+=("$f")
continue
fi
msg_error "$pkgver: target dependency '$f' does not exist!\n"
done done
while read -r _depname _deprepover _depver _subpkg _repourl; do while read -r _depname _deprepover _depver _subpkg _repourl; do
_vpkg=${_subpkg}-${_depver} _vpkg=${_subpkg}-${_depver}
@ -261,18 +289,26 @@ install_pkg_deps() {
echo " [target] ${_vpkg}: not found" echo " [target] ${_vpkg}: not found"
missing_deps+=("$_vpkg") missing_deps+=("$_vpkg")
fi fi
done < <($XBPS_CHECKVERS_XCMD ${XBPS_SKIP_REMOTEREPOS:+-i} -D $XBPS_DISTDIR -sm ${makedepends}) done < <($XBPS_CHECKVERS_XCMD ${XBPS_SKIP_REMOTEREPOS:+-i} -D $XBPS_DISTDIR -sm $templates)
fi fi
# #
# Target run time dependencies # Target run time dependencies
# #
if [[ ${depends} ]]; then if [[ ${depends} ]]; then
_deps=$(setup_pkg_depends "" 1) || exit 1 templates=""
for f in ${_deps}; do local _cleandeps=$(setup_pkg_depends "" 1) || exit 1
if [ ! -f $XBPS_SRCPKGDIR/$f/template ]; then for f in ${_cleandeps}; do
msg_error "$pkgver: runtime dependency '$f' does not exist!\n" if [ -f $XBPS_SRCPKGDIR/$f/template ]; then
templates+=" $f"
continue
fi fi
local _repourl=$($XBPS_QUERY_CMD -R -prepository "$f" 2>/dev/null)
if [ "$_repourl" ]; then
echo " [target] ${f}: found (${_repourl})"
continue
fi
msg_error "$pkgver: target dependency '$f' does not exist!\n"
done done
while read -r _depname _deprepover _depver _subpkg _repourl; do while read -r _depname _deprepover _depver _subpkg _repourl; do
_vpkg=${_subpkg}-${_depver} _vpkg=${_subpkg}-${_depver}
@ -301,8 +337,7 @@ install_pkg_deps() {
echo " [runtime] ${_vpkg}: not found" echo " [runtime] ${_vpkg}: not found"
missing_rdeps+=("$_vpkg") missing_rdeps+=("$_vpkg")
fi fi
done < <($XBPS_CHECKVERS_XCMD ${XBPS_SKIP_REMOTEREPOS:+-i} -D $XBPS_DISTDIR -sm $_deps) done < <($XBPS_CHECKVERS_XCMD ${XBPS_SKIP_REMOTEREPOS:+-i} -D $XBPS_DISTDIR -sm $templates)
unset _deps
fi fi
if [ -n "$XBPS_BUILD_ONLY_ONE_PKG" ]; then if [ -n "$XBPS_BUILD_ONLY_ONE_PKG" ]; then