From 7351fd6d811249b9a0db10f1224128aa5fa81b8d Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Tue, 25 Jan 2022 13:05:28 +0300
Subject: Link build2 libraries to bpkg executable

---
 bpkg/buildfile        | 7 ++++++-
 build/root.build      | 4 ++++
 manifest              | 1 +
 repositories.manifest | 4 ++++
 4 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/bpkg/buildfile b/bpkg/buildfile
index 582b8dc..93f8712 100644
--- a/bpkg/buildfile
+++ b/bpkg/buildfile
@@ -8,7 +8,12 @@
 define xml: file
 xml{*}: extension = xml
 
-import libs  = libbpkg%lib{bpkg}
+import libs = build2%lib{build2}
+
+for m: bin c cc cxx in version
+  import libs += build2%lib{build2-$m}
+
+import libs += libbpkg%lib{bpkg}
 import libs += libbutl%lib{butl}
 import libs += libodb%lib{odb}
 import libs += libodb-sqlite%lib{odb-sqlite}
diff --git a/build/root.build b/build/root.build
index 3c64dc5..b32c01e 100644
--- a/build/root.build
+++ b/build/root.build
@@ -27,3 +27,7 @@ cxx.poptions =+ "-I$out_root" "-I$src_root"
 # be there unless the module is configured).
 #
 using? cli
+
+# Disable build2 libraries importation using the built-in path.
+#
+import.build2 = [null]
diff --git a/manifest b/manifest
index 0de7897..6508ff2 100644
--- a/manifest
+++ b/manifest
@@ -23,3 +23,4 @@ depends: libodb-sqlite [2.5.0-b.22.1 2.5.0-b.23)
 depends: libsqlite3 ^3.21.0 ; ATTACH in transaction
 depends: libbutl [0.15.0-a.0.1 0.15.0-a.1)
 depends: libbpkg [0.15.0-a.0.1 0.15.0-a.1)
+depends: build2 [0.15.0-a.0.1 0.15.0-a.1)
diff --git a/repositories.manifest b/repositories.manifest
index 19fb7ab..29cb1cf 100644
--- a/repositories.manifest
+++ b/repositories.manifest
@@ -3,6 +3,10 @@ summary: build2 package dependency manager repository
 
 :
 role: prerequisite
+location: ../build2.git##HEAD
+
+:
+role: prerequisite
 location: ../libbutl.git##HEAD
 
 :
-- 
cgit v1.1