From def2c2dfaf5374f139b310c4f05b0614cb99359e Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Mon, 28 Mar 2022 15:04:35 +0200
Subject: Implement dependency configuration negotiation

For the detailed history see the dep-config and dep-config-neg branches.
---
 bpkg/package.cxx | 34 ++++++++++++++++++++++++----------
 1 file changed, 24 insertions(+), 10 deletions(-)

(limited to 'bpkg/package.cxx')

diff --git a/bpkg/package.cxx b/bpkg/package.cxx
index 3a356f8..c02bdf4 100644
--- a/bpkg/package.cxx
+++ b/bpkg/package.cxx
@@ -53,17 +53,17 @@ namespace bpkg
       return path;
   }
 
-  // config_package
+  // package_key
   //
-  string config_package::
+  string package_key::
   string () const
   {
-    const std::string& s (db.string);
+    const std::string& s (db.get ().string);
     return !s.empty () ? name.string () + ' ' + s : name.string ();
   }
 
-  bool config_package::
-  operator< (const config_package& v) const
+  bool package_key::
+  operator< (const package_key& v) const
   {
     int r (name.compare (v.name));
     return r != 0 ? (r < 0) : (db < v.db);
@@ -827,7 +827,7 @@ namespace bpkg
   bool
   toolchain_buildtime_dependency (const common_options& o,
                                   const dependency_alternatives_ex& das,
-                                  const package_name& pkg)
+                                  const package_name* pkg)
   {
     if (das.buildtime)
     {
@@ -839,10 +839,10 @@ namespace bpkg
 
           if (dn == "build2")
           {
-            if (d.constraint && !satisfy_build2 (o, d))
+            if (pkg != nullptr && d.constraint && !satisfy_build2 (o, d))
             {
               fail << "unable to satisfy constraint (" << d << ") for "
-                   << "package " << pkg <<
+                   << "package " << *pkg <<
                 info << "available build2 version is " << build2_version;
             }
 
@@ -850,10 +850,10 @@ namespace bpkg
           }
           else if (dn == "bpkg")
           {
-            if (d.constraint && !satisfy_bpkg (o, d))
+            if (pkg != nullptr && d.constraint && !satisfy_bpkg (o, d))
             {
               fail << "unable to satisfy constraint (" << d << ") for "
-                   << "package " << pkg <<
+                   << "package " << *pkg <<
                 info << "available bpkg version is " << bpkg_version;
             }
 
@@ -865,4 +865,18 @@ namespace bpkg
 
     return false;
   }
+
+  bool
+  has_dependencies (const common_options& o,
+                    const dependencies& deps,
+                    const package_name* pkg)
+  {
+    for (const auto& das: deps)
+    {
+      if (!toolchain_buildtime_dependency (o, das, pkg))
+        return true;
+    }
+
+    return false;
+  }
 }
-- 
cgit v1.1