From c0ca17391c41048cd1db19f0aa08e060624f4bd1 Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Mon, 20 Jun 2022 20:59:53 +0300 Subject: Add support for additional *-build package manifest values and alternative buildfile naming --- bpkg/pkg-checkout.cxx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'bpkg/pkg-checkout.cxx') diff --git a/bpkg/pkg-checkout.cxx b/bpkg/pkg-checkout.cxx index 6c6dcf8..2a3f508 100644 --- a/bpkg/pkg-checkout.cxx +++ b/bpkg/pkg-checkout.cxx @@ -319,12 +319,15 @@ namespace bpkg // Calculate the buildfiles checksum if the package has any buildfile // clauses in the dependencies. // + // Note that the available package already has all the buildfiles + // loaded. + // if ((p != nullptr && p->manifest_checksum == mc) ? p->buildfiles_checksum.has_value () : has_buildfile_clause (ap->dependencies)) bc = package_buildfiles_checksum (ap->bootstrap_build, ap->root_build, - d); + ap->buildfiles); } if (p != nullptr) -- cgit v1.1