diff options
author | Boris Kolpackov <boris@codesynthesis.com> | 2022-03-28 15:04:35 +0200 |
---|---|---|
committer | Karen Arutyunov <karen@codesynthesis.com> | 2022-04-27 13:44:04 +0300 |
commit | bd4a189cb8dae25c31ce91f5cd2070765dc45c10 (patch) | |
tree | c2c79e9c235bf83c96d7e1b87dbd6d7707eb6d00 /bpkg/package.hxx | |
parent | 1f2460395e1e052e823332f8eed38315556100c0 (diff) |
In pkg-build postpone collecting dependencies with preferred/required configuration
Also start build collection from scratch on package version replacement.
Diffstat (limited to 'bpkg/package.hxx')
-rw-r--r-- | bpkg/package.hxx | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/bpkg/package.hxx b/bpkg/package.hxx index 7dc8e11..d31e806 100644 --- a/bpkg/package.hxx +++ b/bpkg/package.hxx @@ -1503,8 +1503,8 @@ namespace bpkg // struct config_package { - database& db; - package_name name; + reference_wrapper<database> db; + package_name name; config_package (database& d, package_name n): db (d), name (move (n)) {} @@ -1519,16 +1519,26 @@ namespace bpkg { // See operator==(database, database). // - return name == v.name && &db == &v.db; + return name == v.name && &db.get () == &v.db.get (); } bool operator< (const config_package&) const; + // Return the package string representation in the form: + // + // <name>[ <config-dir>] + // std::string string () const; }; + inline ostream& + operator<< (ostream& os, const config_package& p) + { + return os << p.string (); + } + // Return a count of repositories that contain this repository fragment. // #pragma db view table("main.repository_fragments") |