* [PR PATCH] common/hooks/pre-pkg/04-generate-runtime-deps.sh: fix sorequires
@ 2022-05-13 20:15 classabbyamp
2022-05-13 20:16 ` [PR PATCH] [Merged]: " paper42
0 siblings, 1 reply; 2+ messages in thread
From: classabbyamp @ 2022-05-13 20:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1267 bytes --]
There is a new pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages fix/soreq-newline
https://github.com/void-linux/void-packages/pull/37111
common/hooks/pre-pkg/04-generate-runtime-deps.sh: fix sorequires
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/37111.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fix/soreq-newline-37111.patch --]
[-- Type: text/x-diff, Size: 1302 bytes --]
From eabb5540e3a8f705f96b57ebc19ed0d3ebaf1a52 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Fri, 13 May 2022 16:13:57 -0400
Subject: [PATCH] common/hooks/pre-pkg/04-generate-runtime-deps.sh: fix
sorequires
---
common/hooks/pre-pkg/04-generate-runtime-deps.sh | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/common/hooks/pre-pkg/04-generate-runtime-deps.sh b/common/hooks/pre-pkg/04-generate-runtime-deps.sh
index 987b0cece9c5..eb19ebfe7081 100644
--- a/common/hooks/pre-pkg/04-generate-runtime-deps.sh
+++ b/common/hooks/pre-pkg/04-generate-runtime-deps.sh
@@ -144,7 +144,7 @@ hook() {
if [ "${_pkgname}" != "${pkgname}" ]; then
echo " SONAME: $f <-> ${_sdep}"
- sorequires+="${f}\n"
+ sorequires+="${f} "
else
# Ignore libs by current pkg
echo " SONAME: $f <-> ${_rdep} (ignored)"
@@ -162,9 +162,9 @@ hook() {
store_pkgdestdir_rundeps
for f in ${shlib_requires}; do
- sorequires+="${f}\n"
+ sorequires+="${f} "
done
if [ -n "${sorequires}" ]; then
- echo "${sorequires}" | sort | xargs > ${PKGDESTDIR}/shlib-requires
+ echo "${sorequires}" | xargs -n1 | sort | xargs > ${PKGDESTDIR}/shlib-requires
fi
}
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-05-13 20:16 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-05-13 20:15 [PR PATCH] common/hooks/pre-pkg/04-generate-runtime-deps.sh: fix sorequires classabbyamp
2022-05-13 20:16 ` [PR PATCH] [Merged]: " paper42
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).