diff options
| author | Karen Arutyunov <karen@codesynthesis.com> | 2022-06-20 20:59:53 +0300 |
|---|---|---|
| committer | Karen Arutyunov <karen@codesynthesis.com> | 2022-06-23 12:35:42 +0300 |
| commit | c0ca17391c41048cd1db19f0aa08e060624f4bd1 (patch) | |
| tree | 4037ed4be1abf8f4b85e7e5420c3cac2d2f10503 /bpkg/pkg-unpack.cxx | |
| parent | 2ee693000ff6ea44cfd4fc51c7b058258056610a (diff) | |
Add support for additional *-build package manifest values and alternative buildfile naming
Diffstat (limited to 'bpkg/pkg-unpack.cxx')
| -rw-r--r-- | bpkg/pkg-unpack.cxx | 10 |
1 files changed, 8 insertions, 2 deletions
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); } } |