From 9e8d05e18ecaf9ce1149d4767867ee83eb741fbe Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Tue, 12 Apr 2022 15:28:23 -0400 Subject: [PATCH] common/hooks/pre-pkg/04-generate-runtime-deps.sh: sort deps for reproducibility fixes #36641 --- common/hooks/pre-pkg/04-generate-runtime-deps.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/common/hooks/pre-pkg/04-generate-runtime-deps.sh b/common/hooks/pre-pkg/04-generate-runtime-deps.sh index c8f8c04d4884..0597f98cb286 100644 --- a/common/hooks/pre-pkg/04-generate-runtime-deps.sh +++ b/common/hooks/pre-pkg/04-generate-runtime-deps.sh @@ -34,15 +34,14 @@ add_rundep() { store_pkgdestdir_rundeps() { if [ -n "$run_depends" ]; then - : > ${PKGDESTDIR}/rdeps for f in ${run_depends}; do _curdep="$(echo "$f" | sed -e 's,\(.*\)?.*,\1,')" if [ -z "$($XBPS_UHELPER_CMD getpkgdepname ${_curdep} 2>/dev/null)" -a \ -z "$($XBPS_UHELPER_CMD getpkgname ${_curdep} 2>/dev/null)" ]; then _curdep="${_curdep}>=0" fi - printf -- "${_curdep} " >> ${PKGDESTDIR}/rdeps - done + printf -- "${_curdep}\n" + done | sort > ${PKGDESTDIR}/rdeps fi } @@ -166,6 +165,6 @@ hook() { sorequires+="${f} " done if [ -n "${sorequires}" ]; then - echo "${sorequires}" > ${PKGDESTDIR}/shlib-requires + echo "${sorequires}" | xargs -n1 | sort > ${PKGDESTDIR}/shlib-requires fi }