[PR PATCH] gen-runtime-deps: verify rdeps for shlib_requires too

[PR PATCH] gen-runtime-deps: verify rdeps for shlib_requires too

[sgn]

[-- Attachment #1: Type: text/plain, Size: 1359 bytes --]

There is a new pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages gen-runtime-deps-for-shlib-requires
https://github.com/void-linux/void-packages/pull/40412

gen-runtime-deps: verify rdeps for shlib_requires too
While we're at it, mark one more variables as local

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-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/40412.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gen-runtime-deps-for-shlib-requires-40412.patch --]
[-- Type: text/x-diff, Size: 1627 bytes --]

From 422d73e54ac795cf6754ec659c4b4888ac0afa94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 9 Nov 2022 15:09:12 +0700
Subject: [PATCH] gen-runtime-deps: verify rdeps for shlib_requires too

While we're at it, mark one more variables as local
---
 common/hooks/pre-pkg/04-generate-runtime-deps.sh | 9 +++++----
 1 file changed, 5 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 eb19ebfe7081..9d28ac18f774 100644
--- a/common/hooks/pre-pkg/04-generate-runtime-deps.sh
+++ b/common/hooks/pre-pkg/04-generate-runtime-deps.sh
@@ -46,7 +46,7 @@ store_pkgdestdir_rundeps() {
 }
 
 hook() {
-    local depsftmp f lf j mapshlibs sorequires _curdep elfmagic
+    local depsftmp f lf j mapshlibs sorequires _curdep elfmagic verify_deps
 
     # Disable trap on ERR, xbps-uhelper cmd might return error... but not something
     # to be worried about because if there are broken shlibs this hook returns
@@ -63,6 +63,10 @@ hook() {
     depsftmp=$(mktemp) || exit 1
     find ${PKGDESTDIR} -type f -perm -u+w > $depsftmp 2>/dev/null
 
+    for f in ${shlib_requires}; do
+        verify_deps+=" ${f}"
+    done
+
     exec 3<&0 # save stdin
     exec < $depsftmp
     while read f; do
@@ -161,9 +165,6 @@ hook() {
 
     store_pkgdestdir_rundeps
 
-    for f in ${shlib_requires}; do
-        sorequires+="${f} "
-    done
     if [ -n "${sorequires}" ]; then
         echo "${sorequires}" | xargs -n1 | sort | xargs > ${PKGDESTDIR}/shlib-requires
     fi

Re: [PR PATCH] [Updated] gen-runtime-deps: verify rdeps for shlib_requires too

[sgn]

[-- Attachment #1: Type: text/plain, Size: 1364 bytes --]

There is an updated pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages gen-runtime-deps-for-shlib-requires
https://github.com/void-linux/void-packages/pull/40412

gen-runtime-deps: verify rdeps for shlib_requires too
While we're at it, mark one more variables as local

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-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/40412.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gen-runtime-deps-for-shlib-requires-40412.patch --]
[-- Type: text/x-diff, Size: 1655 bytes --]

From fd16e2dd1c0de8e90bcea65d6669c0885ca8b38a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 9 Nov 2022 15:09:12 +0700
Subject: [PATCH] gen-runtime-deps: verify rdeps for shlib_requires too

While we're at it, mark one more variables as local
---
 common/hooks/pre-pkg/04-generate-runtime-deps.sh | 9 +++++----
 1 file changed, 5 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 8eace6c683e7..a291f2ccc872 100644
--- a/common/hooks/pre-pkg/04-generate-runtime-deps.sh
+++ b/common/hooks/pre-pkg/04-generate-runtime-deps.sh
@@ -46,7 +46,7 @@ store_pkgdestdir_rundeps() {
 }
 
 hook() {
-    local depsftmp f lf j mapshlibs sorequires _curdep elfmagic broken_shlibs
+    local depsftmp f lf j mapshlibs sorequires _curdep elfmagic broken_shlibs verify_deps
 
     # Disable trap on ERR, xbps-uhelper cmd might return error... but not something
     # to be worried about because if there are broken shlibs this hook returns
@@ -63,6 +63,10 @@ hook() {
     depsftmp=$(mktemp) || exit 1
     find ${PKGDESTDIR} -type f -perm -u+w > $depsftmp 2>/dev/null
 
+    for f in ${shlib_requires}; do
+        verify_deps+=" ${f}"
+    done
+
     exec 3<&0 # save stdin
     exec < $depsftmp
     while read f; do
@@ -161,9 +165,6 @@ hook() {
 
     store_pkgdestdir_rundeps
 
-    for f in ${shlib_requires}; do
-        sorequires+="${f} "
-    done
     if [ -n "${sorequires}" ]; then
         echo "${sorequires}" | xargs -n1 | sort | xargs > ${PKGDESTDIR}/shlib-requires
     fi

Re: [PR PATCH] [Merged]: gen-runtime-deps: verify rdeps for shlib_requires too

[sgn]

[-- Attachment #1: Type: text/plain, Size: 1188 bytes --]

There's a merged pull request on the void-packages repository

gen-runtime-deps: verify rdeps for shlib_requires too
https://github.com/void-linux/void-packages/pull/40412

Description:
While we're at it, mark one more variables as local

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-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
-->