From fb8c6c683463a1c18e29d4801bc4f5a33552bf0e Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Wed, 19 Jul 2023 15:14:45 +0300 Subject: Don't reconfigure re-evaluated dependent if it's dependencies are not reconfigured --- bpkg/pkg-build.cxx | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'bpkg/pkg-build.cxx') diff --git a/bpkg/pkg-build.cxx b/bpkg/pkg-build.cxx index f9882b6..ed23ea5 100644 --- a/bpkg/pkg-build.cxx +++ b/bpkg/pkg-build.cxx @@ -5589,10 +5589,14 @@ namespace bpkg database& db (p.db); + // Note: don't update the re-evaluated dependent unless it is + // reconfigured. + // if ((*p.action == build_package::adjust && p.reconfigure ()) || (*p.action == build_package::build && - (p.flags & (build_package::build_repoint | - build_package::build_reevaluate)) != 0)) + ((p.flags & build_package::build_repoint) != 0 || + ((p.flags & build_package::build_reevaluate) != 0 && + p.reconfigure ())))) upkgs.push_back (pkg_command_vars {db.config_orig, !multi_config () && db.main (), p.selected, -- cgit v1.1