Re: [PR PATCH] [Updated] [DO NOT MERGE THIS IS BROKEN] common/build_dependencies.sh: don't ingore missing subpkgs in hostdeps

[voidlinux-github@inbox.vuxu.org]

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

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

https://github.com/Johnnynator/void-packages host_subpkg
https://github.com/void-linux/void-packages/pull/15493

[DO NOT MERGE THIS IS BROKEN] common/build_dependencies.sh: don't ingore missing subpkgs in hostdeps
Currently missing hostmakedepends that are a subpkg are just ignored which leads to failing builds in theses cases if they are needed for cross compiling

e.g. https://build.voidlinux.org/builders/aarch64-musl_builder/builds/22678/steps/shell_3/logs/stdio

A patch file from https://github.com/void-linux/void-packages/pull/15493.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-host_subpkg-15493.patch --]
[-- Type: text/x-diff, Size: 1395 bytes --]

From dea1bf1b6cac1f77b3152beccabd6314dc037898 Mon Sep 17 00:00:00 2001
From: John <johnz@posteo.net>
Date: Tue, 15 Oct 2019 18:58:01 +0200
Subject: [PATCH] common/build_dependencies.sh: don't ignore subpkgs in host
 while cross

compiling, this falls (obviously) apart if it is missing.
See e.g. https://build.voidlinux.org/builders/aarch64-musl_builder/builds/22678/steps/shell_3/logs/stdio
---
 common/xbps-src/shutils/build_dependencies.sh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/common/xbps-src/shutils/build_dependencies.sh b/common/xbps-src/shutils/build_dependencies.sh
index 6d9d727e0d3..73505f39c86 100644
--- a/common/xbps-src/shutils/build_dependencies.sh
+++ b/common/xbps-src/shutils/build_dependencies.sh
@@ -170,7 +170,12 @@ install_pkg_deps() {
                     fi
                 done
                 if [[ $found -eq 1 ]]; then
-                    echo "   [host] ${_vpkg}: not found (subpkg, ignored)"
+                    if [ -n "$cross" ]; then
+                        echo "   [host] ${_vpkg}: not found (subpkg)"
+                        host_missing_deps+=("$_vpkg")
+                    else
+                        echo "   [host] ${_vpkg}: not found (subpkg, ignored)"
+                    fi
                 else
                     echo "   [host] ${_vpkg}: not found"
                     host_missing_deps+=("$_vpkg")