From c0ca17391c41048cd1db19f0aa08e060624f4bd1 Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Mon, 20 Jun 2022 20:59:53 +0300
Subject: Add support for additional *-build package manifest values and
 alternative buildfile naming

---
 bpkg/pkg-unpack.cxx | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'bpkg/pkg-unpack.cxx')

diff --git a/bpkg/pkg-unpack.cxx b/bpkg/pkg-unpack.cxx
index b38a750..2e21c70 100644
--- a/bpkg/pkg-unpack.cxx
+++ b/bpkg/pkg-unpack.cxx
@@ -175,6 +175,7 @@ namespace bpkg
           : has_buildfile_clause (deps))
         bc = package_buildfiles_checksum (nullopt /* bootstrap_build */,
                                           nullopt /* root_build */,
+                                          {}      /* buildfiles */,
                                           d);
     }
 
@@ -414,10 +415,13 @@ namespace bpkg
 
       if (ap != nullptr)
       {
+        // Note that the available package already has all the buildfiles
+        // loaded.
+        //
         if (has_buildfile_clause (ap->dependencies))
           bc = package_buildfiles_checksum (ap->bootstrap_build,
                                             ap->root_build,
-                                            d);
+                                            ap->buildfiles);
       }
       else
       {
@@ -435,7 +439,9 @@ namespace bpkg
         if (has_buildfile_clause (m.dependencies))
           bc = package_buildfiles_checksum (m.bootstrap_build,
                                             m.root_build,
-                                            d);
+                                            m.buildfiles,
+                                            d,
+                                            m.alt_naming);
       }
     }
 
-- 
cgit v1.1