From 351f89ffe10a2f3aadfbc3a80704b5954dc356ca Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Mon, 11 Mar 2024 18:18:16 +0300
Subject: Adapt to build auxiliary machines related changes in libbpkg and
 libbbot

---
 libbrep/common.hxx     | 4 ++++
 mod/mod-build-task.cxx | 5 +++++
 2 files changed, 9 insertions(+)

diff --git a/libbrep/common.hxx b/libbrep/common.hxx
index 04d8453..9c398c8 100644
--- a/libbrep/common.hxx
+++ b/libbrep/common.hxx
@@ -360,6 +360,10 @@ namespace brep
 
   #pragma db value(build_package_config) definition
 
+  // @@ TMP AUXILIARY
+  //
+  #pragma db member(build_package_config::auxiliaries) transient
+
   // 1 for the default configuration which is always present.
   //
   using build_package_configs = small_vector<build_package_config, 1>;
diff --git a/mod/mod-build-task.cxx b/mod/mod-build-task.cxx
index 1a06ce1..0cf59c6 100644
--- a/mod/mod-build-task.cxx
+++ b/mod/mod-build-task.cxx
@@ -409,6 +409,9 @@ handle (request& rq, response& rs)
 
       bool module_pkg (pn.string ().compare (0, 10, "libbuild2-") == 0);
 
+      // Note that the auxiliary environment is crafted by the bbot agent
+      // after the auxiliary machines are booted.
+      //
       task_manifest task (move (pn),
                           move (p.version),
                           move (r->location),
@@ -417,8 +420,10 @@ handle (request& rq, response& rs)
                           move (tests),
                           b.dependency_checksum,
                           cm.machine->name,
+                          {} /* auxiliary_machines */, // @@ TMP AUXILIARY
                           cm.config->target,
                           cm.config->environment,
+                          "" /* auxiliary_environment */,
                           cm.config->args,
                           move (pc.arguments),
                           belongs (*cm.config, module_pkg ? "build2" : "host"),
-- 
cgit v1.1