aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKaren Arutyunov <karen@codesynthesis.com>2024-07-02 17:45:28 +0300
committerKaren Arutyunov <karen@codesynthesis.com>2024-07-31 14:38:50 +0300
commit12824a0e54609b6865ffd9b8eff5157e1c562a80 (patch)
tree360c90b8308bd331581b59234b8dc893cd389a30
parent9a4a925ca599cfaf27e88118011cc2f1cb8d9325 (diff)
Fix precollect lambda in pkg-build to properly override dependency constraints
-rw-r--r--bpkg/pkg-build-collect.cxx17
1 files changed, 16 insertions, 1 deletions
diff --git a/bpkg/pkg-build-collect.cxx b/bpkg/pkg-build-collect.cxx
index c7be96a..d71bb3b 100644
--- a/bpkg/pkg-build-collect.cxx
+++ b/bpkg/pkg-build-collect.cxx
@@ -2557,8 +2557,9 @@ namespace bpkg
const lazy_shared_ptr<repository_fragment>& af (
pkg.repository_fragment);
- for (const dependency& dp: da)
+ for (auto di (da.begin ()); di != da.end (); )
{
+ const dependency& dp (*di);
const package_name& dn (dp.name);
if (buildtime && pdb.type == build2_config_type)
@@ -2753,7 +2754,10 @@ namespace bpkg
assert (unamended || replacement);
if (!(replacement || (unamended && ud)))
+ {
+ ++di;
continue;
+ }
}
if (dsp->state == package_state::broken)
@@ -3029,6 +3033,15 @@ namespace bpkg
apc (sdb, move (cd));
db = &sdb.find_attached (*lc->id);
+
+ // If the above apc() call has also collected this dependency
+ // (may be the case for a system dependency spec), then just
+ // re-iterate the pre-collection of this dependency,
+ // potentially overriding its version constraint using the
+ // command line spec.
+ //
+ if (map_.find (*db, dn) != map_.end ())
+ continue;
}
ddb = db; // Switch to the dependency configuration.
@@ -3328,6 +3341,8 @@ namespace bpkg
specified,
force,
ru});
+
+ ++di;
}
// Now, as we have pre-collected the dependency builds, if