aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bpkg/pkg-build.cxx51
-rw-r--r--bpkg/pkg-configure.cxx4
-rw-r--r--bpkg/pkg-configure.hxx1
-rw-r--r--tests/pkg-build.testscript88
4 files changed, 53 insertions, 91 deletions
diff --git a/bpkg/pkg-build.cxx b/bpkg/pkg-build.cxx
index 6612eef..331ab9d 100644
--- a/bpkg/pkg-build.cxx
+++ b/bpkg/pkg-build.cxx
@@ -762,10 +762,14 @@ namespace bpkg
selected->state == package_state::configured &&
selected->substate != package_substate::system);
+ // Note that if the skeleton is present then the package is either being
+ // already collected or its configuration has been negotiated between
+ // the dependents.
+ //
return !system &&
(dependencies ||
selected->version != available_version () ||
- (!config_vars.empty () &&
+ ((!config_vars.empty () || skeleton) &&
has_buildfile_clause (available->dependencies)) ||
rpt_depts.find (package_key (db, name ())) != rpt_depts.end ());
}
@@ -2830,11 +2834,6 @@ namespace bpkg
postponed_dependencies& postponed_deps,
postponed_configurations& postponed_cfgs,
postponed_positions& postponed_poss,
- //
- // @@ TMP-K This will probably be gone (see below).
- //
- bool force_configured = false,
-
pair<size_t, size_t> reeval_pos =
make_pair(0, 0))
{
@@ -3077,12 +3076,7 @@ namespace bpkg
const map<package_key, bool>* rpt_prereq_flags (nullptr);
// Bail out if this is a configured non-system package and no recursive
- // collection is required nor the collection is forced.
- //
- // @@ TMP-K Forcing collection will probably be gone when we implement
- // complete negotiation implementation since we will recognize the
- // need to recollect by the presence of the respective config vars,
- // etc.
+ // collection is required.
//
bool src_conf (sp != nullptr &&
sp->state == package_state::configured &&
@@ -3101,9 +3095,7 @@ namespace bpkg
if (i != rpt_depts.end ())
rpt_prereq_flags = &i->second;
- if (!force_configured &&
- !reeval &&
- !pkg.recollect_recursively (rpt_depts))
+ if (!reeval && !pkg.recollect_recursively (rpt_depts))
{
l5 ([&]{trace << "skip configured "
<< pkg.available_name_version_db ();});
@@ -4678,8 +4670,7 @@ namespace bpkg
0 /* max_alt_index */,
postponed_deps,
postponed_cfgs,
- postponed_poss,
- true /* force_configured */);
+ postponed_poss);
}
else
l5 ([&]{trace << "dependency "
@@ -5846,7 +5837,6 @@ namespace bpkg
postponed_deps,
postponed_cfgs,
postponed_poss,
- false /* force_configured */,
ed.dependency_position);
ed.reevaluated = true;
@@ -6030,8 +6020,7 @@ namespace bpkg
0 /* max_alt_index */,
postponed_deps,
postponed_cfgs,
- postponed_poss,
- true /* force_configured */);
+ postponed_poss);
}
else
l5 ([&]{trace << "dependency " << b->available_name_version_db ()
@@ -6351,11 +6340,9 @@ namespace bpkg
pc = &postponed_cfgs[ci];
- // @@ TMP-K: "shadow" seems no longer correct.
- //
l5 ([&]{trace << "cfg-negotiation of " << *pc << " failed due "
- << "to dependent " << e.dependent << ", adding "
- << "shadow dependent and re-negotiating";});
+ << "to dependent " << e.dependent << ", refining "
+ << "configuration";});
// Copy over the configuration for further refinement.
//
@@ -6425,6 +6412,8 @@ namespace bpkg
//
assert (!c->negotiated);
+ l5 ([&]{trace << "force-merge " << *c << " into " << *pc;});
+
pc->merge (move (*c));
// Mark configuration as the one being merged from for
@@ -12739,6 +12728,7 @@ namespace bpkg
&*p.alternatives,
move (*p.skeleton),
nullptr /* previous_prerequisites */,
+ p.disfigure,
simulate,
fdb);
}
@@ -12746,15 +12736,10 @@ namespace bpkg
{
assert (sp != nullptr); // See above.
- // Initialize the skeleton if it is not initialized yet.
+ // Note that the skeleton can be present if, for example, this is a
+ // dependency which configuration has been negotiated but it is not
+ // collected recursively since it has no buildfile clauses.
//
- // Note that the skeleton can only be present here if it was
- // initialized during the preparation of the plan to be presented to
- // the user. This only happens after all the refinements and so this
- // plan execution is not simulated.
- //
- assert (!p.skeleton || !simulate);
-
if (!p.skeleton)
p.init_skeleton (o);
@@ -12766,6 +12751,7 @@ namespace bpkg
nullptr /* alternatives */,
move (*p.skeleton),
prereqs (),
+ p.disfigure,
simulate,
fdb);
}
@@ -12820,6 +12806,7 @@ namespace bpkg
nullptr /* alternatives */,
move (*p.skeleton),
prereqs (),
+ false /* disfigured */,
simulate,
fdb);
}
diff --git a/bpkg/pkg-configure.cxx b/bpkg/pkg-configure.cxx
index 854e5e1..a86752e 100644
--- a/bpkg/pkg-configure.cxx
+++ b/bpkg/pkg-configure.cxx
@@ -342,6 +342,7 @@ namespace bpkg
const vector<size_t>* alts,
package_skeleton&& ps,
const vector<package_name>* pps,
+ bool disfigured,
bool simulate,
const function<find_database_function>& fdb)
{
@@ -365,8 +366,6 @@ namespace bpkg
l4 ([&]{trace << "src_root: " << src_root << ", "
<< "out_root: " << out_root;});
- bool disfigured (ps.disfigure_); // @@ TMP-K pass explicitly.
-
// Verify all our prerequisites are configured and populate the
// prerequisites list.
//
@@ -628,6 +627,7 @@ namespace bpkg
move (src_root),
move (out_root)),
nullptr /* prerequisites */,
+ false /* disfigured */,
false /* simulate */);
}
diff --git a/bpkg/pkg-configure.hxx b/bpkg/pkg-configure.hxx
index cbfad7a..16ed96f 100644
--- a/bpkg/pkg-configure.hxx
+++ b/bpkg/pkg-configure.hxx
@@ -59,6 +59,7 @@ namespace bpkg
const vector<size_t>* alternatives,
package_skeleton&&,
const vector<package_name>* prerequisites,
+ bool disfigured,
bool simulate,
const function<find_database_function>& = {});
diff --git a/tests/pkg-build.testscript b/tests/pkg-build.testscript
index eda0a5c..fd4fea4 100644
--- a/tests/pkg-build.testscript
+++ b/tests/pkg-build.testscript
@@ -5493,8 +5493,7 @@ test.options += --no-progress
trace: collect_build_postponed (1): cfg-negotiate begin {foo | libfoo->{foo/1,1}}
%.*
trace: collect_build_postponed (1): recursively collect cfg-negotiated dependencies
- trace: collect_build_prerequisites: begin libfoo/1.0.0
- trace: collect_build_prerequisites: end libfoo/1.0.0
+ trace: collect_build_prerequisites: skip configured libfoo/1.0.0
trace: collect_build_postponed (1): recursively collect cfg-negotiated dependents
trace: collect_build_postponed (1): select cfg-negotiated dependency alternative for dependent foo/1.0.0
trace: collect_build_prerequisites: resume foo/1.0.0
@@ -5637,8 +5636,7 @@ test.options += --no-progress
trace: collect_build_postponed (1): cfg-negotiate begin {foo^ | libfoo->{foo/1,1}}
%.*
trace: collect_build_postponed (1): recursively collect cfg-negotiated dependencies
- trace: collect_build_prerequisites: begin libfoo/0.1.0
- trace: collect_build_prerequisites: end libfoo/0.1.0
+ trace: collect_build_prerequisites: skip configured libfoo/0.1.0
trace: collect_build_postponed (1): recursively collect cfg-negotiated dependents
trace: collect_build_postponed (1): select cfg-negotiated dependency alternative for dependent foo/1.0.0
trace: collect_build_prerequisites: resume foo/1.0.0
@@ -6241,10 +6239,8 @@ test.options += --no-progress
trace: collect_build_postponed (1): cfg-negotiate begin {bax^ baz^ | libfoo->{bax/1,1 baz/1,1} libbar->{baz/1,1}}
%.*
trace: collect_build_postponed (1): recursively collect cfg-negotiated dependencies
- trace: collect_build_prerequisites: begin libfoo/1.0.0
- trace: collect_build_prerequisites: end libfoo/1.0.0
- trace: collect_build_prerequisites: begin libbar/1.0.0
- trace: collect_build_prerequisites: end libbar/1.0.0
+ trace: collect_build_prerequisites: skip configured libfoo/1.0.0
+ trace: collect_build_prerequisites: skip configured libbar/1.0.0
trace: collect_build_postponed (1): recursively collect cfg-negotiated dependents
trace: collect_build_postponed (1): select cfg-negotiated dependency alternative for dependent bax/1.0.0
trace: collect_build_prerequisites: resume bax/1.0.0
@@ -6255,7 +6251,7 @@ test.options += --no-progress
trace: postponed_configurations::add: add {bax 2,1: libbox libbar} to {bax^ baz^ | libfoo->{bax/1,1 baz/1,1} libbar->{baz/1,1}}?
%.*
trace: collect_build_prerequisites: cfg-postponing dependent bax/1.0.0 involves (being) negotiated configurations and results in {bax^ baz^ | libfoo->{bax/1,1 baz/1,1} libbar->{bax/2,1 baz/1,1} libbox->{bax/2,1}}?, throwing retry_configuration
- trace: collect_build_postponed (0): cfg-negotiation of {bax^ | libfoo->{bax/1,1}} failed due to dependent bax, adding shadow dependent and re-negotiating
+ trace: collect_build_postponed (0): cfg-negotiation of {bax^ | libfoo->{bax/1,1}} failed due to dependent bax, refining configuration
trace: collect_build_postponed (1): begin {bax^ | libfoo->{bax/1,1}}
%.*
trace: collect_build_postponed (1): re-evaluate existing dependents for {bax^ | libfoo->{bax/1,1}}
@@ -6278,10 +6274,8 @@ test.options += --no-progress
trace: collect_build_postponed (1): cfg-negotiate begin {bax^ baz^ | libfoo->{bax/1,1 baz/1,1} libbar->{baz/1,1}}
%.*
trace: collect_build_postponed (1): recursively collect cfg-negotiated dependencies
- trace: collect_build_prerequisites: begin libfoo/1.0.0
- trace: collect_build_prerequisites: end libfoo/1.0.0
- trace: collect_build_prerequisites: begin libbar/1.0.0
- trace: collect_build_prerequisites: end libbar/1.0.0
+ trace: collect_build_prerequisites: skip configured libfoo/1.0.0
+ trace: collect_build_prerequisites: skip configured libbar/1.0.0
trace: collect_build_postponed (1): recursively collect cfg-negotiated dependents
trace: collect_build_postponed (1): select cfg-negotiated dependency alternative for dependent bax/1.0.0
trace: collect_build_prerequisites: resume bax/1.0.0
@@ -6420,10 +6414,8 @@ test.options += --no-progress
trace: collect_build_postponed (1): cfg-negotiate begin {bax^ baz^ | libfoo->{bax/1,1 baz/1,1} libbar->{baz/1,1}}
%.*
trace: collect_build_postponed (1): recursively collect cfg-negotiated dependencies
- trace: collect_build_prerequisites: begin libfoo/1.0.0
- trace: collect_build_prerequisites: end libfoo/1.0.0
- trace: collect_build_prerequisites: begin libbar/1.0.0
- trace: collect_build_prerequisites: end libbar/1.0.0
+ trace: collect_build_prerequisites: skip configured libfoo/1.0.0
+ trace: collect_build_prerequisites: skip configured libbar/1.0.0
trace: collect_build_postponed (1): recursively collect cfg-negotiated dependents
trace: collect_build_postponed (1): select cfg-negotiated dependency alternative for dependent bax/1.0.0
trace: collect_build_prerequisites: resume bax/1.0.0
@@ -6435,6 +6427,7 @@ test.options += --no-progress
trace: postponed_configurations::add: merge {box | libbox->{box/1,1}} into {bax^ baz^ | libfoo->{bax/1,1 baz/1,1} libbar->{bax/2,1 baz/1,1} libbox->{bax/2,1}}?
trace: collect_build_prerequisites: cfg-postponing dependent bax/1.0.0 merges non-negotiated and/or being negotiated configurations in and results in {bax^ baz^ box | libfoo->{bax/1,1 baz/1,1} libbar->{bax/2,1 baz/1,1} libbox->{bax/2,1 box/1,1}}?, throwing merge_configuration
trace: collect_build_postponed (0): cfg-negotiation of {bax^ | libfoo->{bax/1,1}} failed due to non-negotiated clusters, force-merging based on shadow cluster {bax^ baz^ box | libfoo->{bax/1,1 baz/1,1} libbar->{bax/2,1 baz/1,1} libbox->{bax/2,1 box/1,1}}?
+ trace: collect_build_postponed (0): force-merge {box | libbox->{box/1,1}} into {bax^ | libfoo->{bax/1,1}}
trace: collect_build_postponed (1): begin {bax^ box | libfoo->{bax/1,1} libbox->{box/1,1}}
%.*
trace: collect_build_postponed (1): re-evaluate existing dependents for {bax^ box | libfoo->{bax/1,1} libbox->{box/1,1}}
@@ -6457,12 +6450,10 @@ test.options += --no-progress
trace: collect_build_postponed (1): cfg-negotiate begin {bax^ baz^ box | libfoo->{bax/1,1 baz/1,1} libbox->{box/1,1} libbar->{baz/1,1}}
%.*
trace: collect_build_postponed (1): recursively collect cfg-negotiated dependencies
- trace: collect_build_prerequisites: begin libfoo/1.0.0
- trace: collect_build_prerequisites: end libfoo/1.0.0
+ trace: collect_build_prerequisites: skip configured libfoo/1.0.0
trace: collect_build_prerequisites: begin libbox/0.1.0
trace: collect_build_prerequisites: end libbox/0.1.0
- trace: collect_build_prerequisites: begin libbar/1.0.0
- trace: collect_build_prerequisites: end libbar/1.0.0
+ trace: collect_build_prerequisites: skip configured libbar/1.0.0
trace: collect_build_postponed (1): recursively collect cfg-negotiated dependents
trace: collect_build_postponed (1): select cfg-negotiated dependency alternative for dependent bax/1.0.0
trace: collect_build_prerequisites: resume bax/1.0.0
@@ -6584,10 +6575,8 @@ test.options += --no-progress
trace: collect_build_postponed (1): cfg-negotiate begin {bax^ baz^ | libfoo->{bax/1,1 baz/1,1} libbar->{baz/1,1}}
%.*
trace: collect_build_postponed (1): recursively collect cfg-negotiated dependencies
- trace: collect_build_prerequisites: begin libfoo/1.0.0
- trace: collect_build_prerequisites: end libfoo/1.0.0
- trace: collect_build_prerequisites: begin libbar/1.0.0
- trace: collect_build_prerequisites: end libbar/1.0.0
+ trace: collect_build_prerequisites: skip configured libfoo/1.0.0
+ trace: collect_build_prerequisites: skip configured libbar/1.0.0
trace: collect_build_postponed (1): recursively collect cfg-negotiated dependents
trace: collect_build_postponed (1): select cfg-negotiated dependency alternative for dependent bax/1.0.0
trace: collect_build_prerequisites: resume bax/1.0.0
@@ -6598,7 +6587,7 @@ test.options += --no-progress
trace: postponed_configurations::add: add {bax 2,1: libbox libbar} to {bax^ baz^ | libfoo->{bax/1,1 baz/1,1} libbar->{baz/1,1}}?
%.*
trace: collect_build_prerequisites: cfg-postponing dependent bax/1.0.0 involves (being) negotiated configurations and results in {bax^ baz^ | libfoo->{bax/1,1 baz/1,1} libbar->{bax/2,1 baz/1,1} libbox->{bax/2,1}}?, throwing retry_configuration
- trace: collect_build_postponed (0): cfg-negotiation of {bax^ | libfoo->{bax/1,1}} failed due to dependent bax, adding shadow dependent and re-negotiating
+ trace: collect_build_postponed (0): cfg-negotiation of {bax^ | libfoo->{bax/1,1}} failed due to dependent bax, refining configuration
trace: collect_build_postponed (1): begin {bax^ | libfoo->{bax/1,1}}
%.*
trace: collect_build_postponed (1): re-evaluate existing dependents for {bax^ | libfoo->{bax/1,1}}
@@ -6620,10 +6609,8 @@ test.options += --no-progress
trace: collect_build_postponed (1): cfg-negotiate begin {bax^ baz^ | libfoo->{bax/1,1 baz/1,1} libbar->{baz/1,1}}
%.*
trace: collect_build_postponed (1): recursively collect cfg-negotiated dependencies
- trace: collect_build_prerequisites: begin libfoo/1.0.0
- trace: collect_build_prerequisites: end libfoo/1.0.0
- trace: collect_build_prerequisites: begin libbar/1.0.0
- trace: collect_build_prerequisites: end libbar/1.0.0
+ trace: collect_build_prerequisites: skip configured libfoo/1.0.0
+ trace: collect_build_prerequisites: skip configured libbar/1.0.0
trace: collect_build_postponed (1): recursively collect cfg-negotiated dependents
trace: collect_build_postponed (1): select cfg-negotiated dependency alternative for dependent bax/1.0.0
trace: collect_build_prerequisites: resume bax/1.0.0
@@ -6687,8 +6674,7 @@ test.options += --no-progress
trace: collect_build_postponed (1): cfg-negotiate begin {bax^ | libfoo->{bax/1,1}}
%.*
trace: collect_build_postponed (1): recursively collect cfg-negotiated dependencies
- trace: collect_build_prerequisites: begin libfoo/1.0.0
- trace: collect_build_prerequisites: end libfoo/1.0.0
+ trace: collect_build_prerequisites: skip configured libfoo/1.0.0
trace: collect_build_postponed (1): recursively collect cfg-negotiated dependents
trace: collect_build_postponed (1): select cfg-negotiated dependency alternative for dependent bax/1.0.0
trace: collect_build_prerequisites: resume bax/1.0.0
@@ -6711,8 +6697,7 @@ test.options += --no-progress
trace: collect_build_postponed (2): recursively collect cfg-negotiated dependencies
trace: collect_build_prerequisites: begin libbox/0.1.0
trace: collect_build_prerequisites: end libbox/0.1.0
- trace: collect_build_prerequisites: begin libbar/1.0.0
- trace: collect_build_prerequisites: end libbar/1.0.0
+ trace: collect_build_prerequisites: skip configured libbar/1.0.0
trace: collect_build_postponed (2): recursively collect cfg-negotiated dependents
trace: collect_build_postponed (2): select cfg-negotiated dependency alternative for dependent bax/1.0.0
trace: collect_build_prerequisites: resume bax/1.0.0
@@ -6815,7 +6800,7 @@ test.options += --no-progress
trace: postponed_configurations::add: merge {bar | libbar->{bar/1,1}}! into {box foo | libfoo->{box/1,1 foo/1,1} libbar->{box/1,1}}!
%.*
trace: collect_build_prerequisites: cfg-postponing dependent box/1.0.0 involves (being) negotiated configurations and results in {bar box foo | libfoo->{box/1,1 foo/1,1} libbar->{bar/1,1 box/1,1}}!, throwing retry_configuration
- trace: collect_build_postponed (0): cfg-negotiation of {foo | libfoo->{foo/1,1}} failed due to dependent box, adding shadow dependent and re-negotiating
+ trace: collect_build_postponed (0): cfg-negotiation of {foo | libfoo->{foo/1,1}} failed due to dependent box, refining configuration
trace: collect_build_postponed (1): begin {foo | libfoo->{foo/1,1}}
%.*
trace: collect_build_postponed (1): cfg-negotiate begin {foo | libfoo->{foo/1,1}}
@@ -8953,8 +8938,7 @@ test.options += --no-progress
trace: collect_build_postponed (1): cfg-negotiate begin {tex^ tix | libbar->{tex/1,1 tix/1,1}}
%.*
trace: collect_build_postponed (1): recursively collect cfg-negotiated dependencies
- trace: collect_build_prerequisites: begin libbar/1.0.0
- trace: collect_build_prerequisites: end libbar/1.0.0
+ trace: collect_build_prerequisites: skip configured libbar/1.0.0
trace: collect_build_postponed (1): recursively collect cfg-negotiated dependents
trace: collect_build_postponed (1): select cfg-negotiated dependency alternative for dependent tex/1.0.0
trace: collect_build_prerequisites: resume tex/1.0.0
@@ -8985,8 +8969,7 @@ test.options += --no-progress
trace: collect_build_postponed (1): cfg-negotiate begin {tix | libbar->{tix/1,1}}
%.*
trace: collect_build_postponed (1): recursively collect cfg-negotiated dependencies
- trace: collect_build_prerequisites: begin libbar/1.0.0
- trace: collect_build_prerequisites: end libbar/1.0.0
+ trace: collect_build_prerequisites: skip configured libbar/1.0.0
trace: collect_build_postponed (1): recursively collect cfg-negotiated dependents
trace: collect_build_postponed (1): select cfg-negotiated dependency alternative for dependent tix/1.0.0
trace: collect_build_prerequisites: resume tix/1.0.0
@@ -9023,8 +9006,7 @@ test.options += --no-progress
trace: collect_build_postponed (3): cfg-negotiate begin {tex | libfoo->{tex/2,1}}
%.*
trace: collect_build_postponed (3): recursively collect cfg-negotiated dependencies
- trace: collect_build_prerequisites: begin libfoo/1.0.0
- trace: collect_build_prerequisites: end libfoo/1.0.0
+ trace: collect_build_prerequisites: skip configured libfoo/1.0.0
trace: collect_build_postponed (3): recursively collect cfg-negotiated dependents
trace: collect_build_postponed (3): select cfg-negotiated dependency alternative for dependent tex/1.0.0
trace: collect_build_prerequisites: resume tex/1.0.0
@@ -9128,8 +9110,7 @@ test.options += --no-progress
trace: collect_build_postponed (1): cfg-negotiate begin {tix^ | libbar->{tix/1,1}}
%.*
trace: collect_build_postponed (1): recursively collect cfg-negotiated dependencies
- trace: collect_build_prerequisites: begin libbar/1.0.0
- trace: collect_build_prerequisites: end libbar/1.0.0
+ trace: collect_build_prerequisites: skip configured libbar/1.0.0
trace: collect_build_postponed (1): recursively collect cfg-negotiated dependents
trace: collect_build_postponed (1): select cfg-negotiated dependency alternative for dependent tix/1.0.0
trace: collect_build_prerequisites: resume tix/1.0.0
@@ -9167,8 +9148,7 @@ test.options += --no-progress
trace: collect_build_postponed (3): cfg-negotiate begin {tex | libfoo->{tex/2,1}}
%.*
trace: collect_build_postponed (3): recursively collect cfg-negotiated dependencies
- trace: collect_build_prerequisites: begin libfoo/1.0.0
- trace: collect_build_prerequisites: end libfoo/1.0.0
+ trace: collect_build_prerequisites: skip configured libfoo/1.0.0
trace: collect_build_postponed (3): recursively collect cfg-negotiated dependents
trace: collect_build_postponed (3): select cfg-negotiated dependency alternative for dependent tex/0.3.0
trace: collect_build_prerequisites: resume tex/0.3.0
@@ -9248,8 +9228,7 @@ test.options += --no-progress
trace: collect_build_postponed (2): cfg-negotiate begin {tex | libfoo->{tex/1,1}}
%.*
trace: collect_build_postponed (2): recursively collect cfg-negotiated dependencies
- trace: collect_build_prerequisites: begin libfoo/1.0.0
- trace: collect_build_prerequisites: end libfoo/1.0.0
+ trace: collect_build_prerequisites: skip configured libfoo/1.0.0
trace: collect_build_postponed (2): recursively collect cfg-negotiated dependents
trace: collect_build_postponed (2): select cfg-negotiated dependency alternative for dependent tex/0.1.0
trace: collect_build_prerequisites: resume tex/0.1.0
@@ -9329,8 +9308,7 @@ test.options += --no-progress
trace: collect_build_postponed (2): cfg-negotiate begin {tex | libfoo->{tex/1,1}}
%.*
trace: collect_build_postponed (2): recursively collect cfg-negotiated dependencies
- trace: collect_build_prerequisites: begin libfoo/1.0.0
- trace: collect_build_prerequisites: end libfoo/1.0.0
+ trace: collect_build_prerequisites: skip configured libfoo/1.0.0
trace: collect_build_postponed (2): recursively collect cfg-negotiated dependents
trace: collect_build_postponed (2): select cfg-negotiated dependency alternative for dependent tex/0.1.0
trace: collect_build_prerequisites: resume tex/0.1.0
@@ -9413,8 +9391,7 @@ test.options += --no-progress
trace: collect_build_postponed (2): cfg-negotiate begin {tex | libfoo->{tex/2,1}}
%.*
trace: collect_build_postponed (2): recursively collect cfg-negotiated dependencies
- trace: collect_build_prerequisites: begin libfoo/1.0.0
- trace: collect_build_prerequisites: end libfoo/1.0.0
+ trace: collect_build_prerequisites: skip configured libfoo/1.0.0
trace: collect_build_postponed (2): recursively collect cfg-negotiated dependents
trace: collect_build_postponed (2): select cfg-negotiated dependency alternative for dependent tex/0.2.0
trace: collect_build_prerequisites: resume tex/0.2.0
@@ -10956,8 +10933,7 @@ test.options += --no-progress
trace: collect_build_postponed (1): cfg-negotiate begin {bar^ dix | libbar->{bar/1,1 dix/1,1}}
%.*
trace: collect_build_postponed (1): recursively collect cfg-negotiated dependencies
- trace: collect_build_prerequisites: begin libbar/1.0.0
- trace: collect_build_prerequisites: end libbar/1.0.0
+ trace: collect_build_prerequisites: skip configured libbar/1.0.0
trace: collect_build_postponed (1): recursively collect cfg-negotiated dependents
trace: collect_build_postponed (1): select cfg-negotiated dependency alternative for dependent bar/1.0.0
trace: collect_build_prerequisites: resume bar/1.0.0
@@ -11028,8 +11004,7 @@ test.options += --no-progress
trace: collect_build_postponed (1): cfg-negotiate begin {dix | libbar->{dix/1,1}}
%.*
trace: collect_build_postponed (1): recursively collect cfg-negotiated dependencies
- trace: collect_build_prerequisites: begin libbar/1.0.0
- trace: collect_build_prerequisites: end libbar/1.0.0
+ trace: collect_build_prerequisites: skip configured libbar/1.0.0
trace: collect_build_postponed (1): recursively collect cfg-negotiated dependents
trace: collect_build_postponed (1): select cfg-negotiated dependency alternative for dependent dix/1.0.0
trace: collect_build_prerequisites: resume dix/1.0.0
@@ -11115,8 +11090,7 @@ test.options += --no-progress
trace: collect_build_postponed (6): cfg-negotiate begin {dex | libfoo->{dex/2,1}}
%.*
trace: collect_build_postponed (6): recursively collect cfg-negotiated dependencies
- trace: collect_build_prerequisites: begin libfoo/1.0.0
- trace: collect_build_prerequisites: end libfoo/1.0.0
+ trace: collect_build_prerequisites: skip configured libfoo/1.0.0
trace: collect_build_postponed (6): recursively collect cfg-negotiated dependents
trace: collect_build_postponed (6): select cfg-negotiated dependency alternative for dependent dex/1.0.0
trace: collect_build_prerequisites: resume dex/1.0.0