From 1fe7b9931c80e4515cc9e30e5b4192dd8bfdf43e Mon Sep 17 00:00:00 2001
From: Caleb Connolly <caleb@postmarketos.org>
Date: Sun, 21 Jul 2024 17:35:36 +0200
Subject: [PATCH] build: package: queue subpkg depends for base package too (MR
 2380)

We handle this correctly for dependencies of the base package but not
the base package itself.... Fix this.

Should avoid duplication here ideally.

Signed-off-by: Caleb Connolly <caleb@postmarketos.org>
---
 pmb/build/_package.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pmb/build/_package.py b/pmb/build/_package.py
index 97e3d382..3a0c711e 100644
--- a/pmb/build/_package.py
+++ b/pmb/build/_package.py
@@ -264,6 +264,12 @@ def process_package(
     if base_build_status.necessary():
         queue_build(base_aports, base_apkbuild, base_depends)
 
+    # Also traverse subpackage depends, they shouldn't be included in base_depends since they
+    # aren't needed for building (and can conflict with depends for other subpackages)
+    depends += sum(
+        map(lambda sp: sp["depends"] if sp else [], base_apkbuild["subpackages"].values()), []
+    )
+
     parent = pkgname
     while len(depends):
         # FIXME: pop(0) is really quite slow!