From 0f3243164d69a7a62b9db503c549127e87ec8a32 Mon Sep 17 00:00:00 2001 From: Toyam Cox Date: Wed, 27 Jan 2021 13:49:59 -0500 Subject: [PATCH 1/2] xbps-src: Improve the showing of variables --- xbps-src | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/xbps-src b/xbps-src index fa677084ce0..2a4631c9938 100755 --- a/xbps-src +++ b/xbps-src @@ -836,6 +836,7 @@ case "$XBPS_TARGET" in read_pkg ignore-problems for sub_name in $subpackages; do if [ $sub_name = $XBPS_TARGET_PKG ]; then + . ${XBPS_COMMONDIR}/environment/setup-subpkg/subpkg.sh ${sub_name}_package fi done @@ -859,6 +860,7 @@ case "$XBPS_TARGET" in read_pkg ignore-problems for sub_name in $subpackages; do if [ $sub_name = $XBPS_TARGET_PKG ]; then + . ${XBPS_COMMONDIR}/environment/setup-subpkg/subpkg.sh ${sub_name}_package fi done @@ -886,6 +888,34 @@ case "$XBPS_TARGET" in fi # The trailing space gets stripped before printing anyway done ;; + dbulk-dump) + read_pkg + for x in pkgname version revision; do + printf '%s: %s\n' "$x" "${!x}" + done + for x in hostmakedepends makedepends depends; do + arr=(${!x}) + if [[ ${#arr} -gt 0 ]]; then + printf '%s:\n' "$x" + printf ' %s\n' "${arr[@]}" + fi + done + if [[ $subpackages ]]; then + printf 'subpackages:\n' + for x in ${subpackages}; do + . ${XBPS_COMMONDIR}/environment/setup-subpkg/subpkg.sh + ${x}_package + printf ' %s\n' "$x" + for x in depends; do + arr=(${!x}) + if [[ ${#arr} -gt 0 ]]; then + printf ' %s:\n' "$x" + printf ' %s\n' "${arr[@]}" + fi + done + done + fi + ;; show-options) read_pkg ignore-problems show_pkg_build_options From f99708d0722c6357eeee418a6dece2e075579635 Mon Sep 17 00:00:00 2001 From: Toyam Cox Date: Wed, 27 Jan 2021 13:50:29 -0500 Subject: [PATCH 2/2] rust: rust-std never depended on itself --- srcpkgs/rust/template | 1 - 1 file changed, 1 deletion(-) diff --git a/srcpkgs/rust/template b/srcpkgs/rust/template index 4d25635d409..6bb928e1478 100644 --- a/srcpkgs/rust/template +++ b/srcpkgs/rust/template @@ -354,7 +354,6 @@ rust-doc_package() { rust-std_package() { short_desc+=" - standard library" - depends="" pkg_install() { vmove usr/lib/rustlib }