[PR PATCH] xbps-src: fix detecting subpackage availability

[PR PATCH] xbps-src: fix detecting subpackage availability

[paper42]

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

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

https://github.com/paper42/void-packages xbps-src-fix-subpkg-avail
https://github.com/void-linux/void-packages/pull/37617

xbps-src: fix detecting subpackage availability
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

This is marked as draft because it doesn't work as expected in all cases, for example when a subpackage is added like in cryptsetup:
```sh
if [ "$XBPS_TARGET_LIBC" = musl ]; then
	configure_args+=" --enable-static-cryptsetup"
	subpackages+=" cryptsetup-static"
...
```

```sh
%: ./xbps-src show-avail cryptsetup-static; echo $?
0
```

fixes #37578

<!--
#### 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/37617.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-xbps-src-fix-subpkg-avail-37617.patch --]
[-- Type: text/x-diff, Size: 1413 bytes --]

From f7f8cf709198a5c9b8d3287bc427b3969ca1cdae Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Mon, 20 Jun 2022 01:27:05 +0200
Subject: [PATCH] xbps-src: fix detecting subpackage availability

---
 common/xbps-src/shutils/pkgtarget.sh | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/common/xbps-src/shutils/pkgtarget.sh b/common/xbps-src/shutils/pkgtarget.sh
index ba8c63bca8aa..df7e4828b623 100644
--- a/common/xbps-src/shutils/pkgtarget.sh
+++ b/common/xbps-src/shutils/pkgtarget.sh
@@ -16,14 +16,21 @@ check_existing_pkg() {
 check_pkg_arch() {
     local cross="$1" _arch f match nonegation
 
-    if [ -n "$archs" ]; then
-        if [ -n "$cross" ]; then
-            _arch="$XBPS_TARGET_MACHINE"
-        elif [ -n "$XBPS_ARCH" ]; then
-            _arch="$XBPS_ARCH"
-        else
-            _arch="$XBPS_MACHINE"
+    if [ -n "$cross" ]; then
+        _arch="$XBPS_TARGET_MACHINE"
+    elif [ -n "$XBPS_ARCH" ]; then
+        _arch="$XBPS_ARCH"
+    else
+        _arch="$XBPS_MACHINE"
+    fi
+
+    if [ "$pkgname" != "$sourcepkg" ]; then
+        if ! echo "$subpackages" | grep -q -w "$pkgname"; then
+            report_broken "${pkgname}-${version}_${revision}: this subpackage cannot be built for ${_arch}.\n"
         fi
+    fi
+
+    if [ -n "$archs" ]; then
         set -f
         for f in ${archs}; do
             set +f

Re: xbps-src: fix detecting subpackage availability

[github-actions]

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

New comment by github-actions[bot] on void-packages repository

https://github.com/void-linux/void-packages/pull/37617#issuecomment-1250175575

Comment:
Pull Requests become stale 90 days after last activity and are closed 14 days after that.  If this pull request is still relevant bump it or assign it.