From f123dd8476dc4678e5510008ca1f65162df67171 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Tue, 1 Feb 2022 15:58:56 +0200
Subject: Temporarily disable linking of libbuild2 until resolve symbol clash

---
 bpkg/bpkg.cxx  |  6 +++++-
 bpkg/buildfile | 10 +++++++---
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/bpkg/bpkg.cxx b/bpkg/bpkg.cxx
index e9cb1d0..6abf866 100644
--- a/bpkg/bpkg.cxx
+++ b/bpkg/bpkg.cxx
@@ -14,6 +14,7 @@
 
 // Embedded build system driver.
 //
+#if 0
 #include <libbuild2/types.hxx>
 #include <libbuild2/utility.hxx>
 
@@ -24,6 +25,7 @@
 #include <libbuild2/cxx/init.hxx>
 #include <libbuild2/bash/init.hxx>
 #include <libbuild2/version/init.hxx>
+#endif
 
 #include <bpkg/types.hxx>
 #include <bpkg/utility.hxx>
@@ -201,7 +203,7 @@ static const size_t args_pos (numeric_limits<size_t>::max () / 2);
 //
 template <typename O>
 static O
-init (const char* argv0,
+init (const char* /*argv0*/,
       const common_options& co,
       cli::group_scanner& scan,
       strings& args, cli::vector_scanner& args_scan,
@@ -389,6 +391,7 @@ init (const char* argv0,
   //
   // @@ TODO: perhaps we should only do it for commands that need it?
   //
+#if 0
   {
     // @@ TMP: pass proper values instead of dummies.
     //
@@ -402,6 +405,7 @@ init (const char* argv0,
     build2::version::build2_version_load ();
     build2::in::build2_in_load ();
   }
+#endif
 
   return o;
 }
diff --git a/bpkg/buildfile b/bpkg/buildfile
index cc9e7b5..928bd35 100644
--- a/bpkg/buildfile
+++ b/bpkg/buildfile
@@ -8,12 +8,16 @@
 define xml: file
 xml{*}: extension = xml
 
-import libs = build2%lib{build2}
+libs =
+
+# @@ TMP
+#
+#import libs = build2%lib{build2}
 
 # NOTE: see also module loading in bpkg.cxx if adding anything here.
 #
-for m: bin c cc cxx in version
-  import libs += build2%lib{build2-$m}
+#for m: bin c cc cxx in version
+#  import libs += build2%lib{build2-$m}
 
 import libs += libbpkg%lib{bpkg}
 import libs += libbutl%lib{butl}
-- 
cgit v1.1