From ceeb72841035fb5a774b073f4683cac49182ac11 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Tue, 5 Jul 2022 12:47:15 +0200 Subject: Switch to libpkg-config from libpkgconf --- README-GIT | 2 +- build2 | 2 +- buildfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README-GIT b/README-GIT index 63223bd..ef48a70 100644 --- a/README-GIT +++ b/README-GIT @@ -25,7 +25,7 @@ A few additional notes: commits)' next to submodules (i.e., git "thinks" you have modified the member project by "setting back" its subproject commit). -2. The pkgconf, sqlite and libodb* submodules are not updated by default +2. The libpkg-config, sqlite and libodb* submodules are not updated by default (e.g., with the above command). This is achieved with: git config --file .gitmodules submodule.sqlite.update none diff --git a/build2 b/build2 index 651caf2..cf9d81d 160000 --- a/build2 +++ b/build2 @@ -1 +1 @@ -Subproject commit 651caf2377c5b7c144386c6a479c98d1cb98d417 +Subproject commit cf9d81dbe0eadbadcc81b2565ce73e7eff26f982 diff --git a/buildfile b/buildfile index 77d7e09..3c4164d 100644 --- a/buildfile +++ b/buildfile @@ -21,7 +21,7 @@ build2_repo="https://stage.build2.org/1" # # See also subprojects in bootstrap.build. # -d = libpkgconf/ libbutl/ build2/ libsqlite3/ libodb/ libodb-sqlite/ \ +d = libpkg-config/ libbutl/ build2/ libsqlite3/ libodb/ libodb-sqlite/ \ libbpkg/ bpkg/ bdep/ doc/ libbuild2-*/ if ($build.meta_operation == 'dist') -- cgit v1.1