aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2017-09-25 01:27:43 (GMT)
committerBoris Kolpackov <boris@codesynthesis.com>2017-09-25 01:33:26 (GMT)
commit3ee5422b11ddef3b9b10f71151e8eb418a0c8b41 (patch)
treee254854b003edd321881e7c932000388cddaa497
parent3958e022ab889e513b115b0662801678a7641c2f (diff)
Add libpkgconf submodule
-rw-r--r--.gitmodules3
-rw-r--r--README-GIT4
-rw-r--r--build/bootstrap.build3
-rw-r--r--buildfile3
m---------libpkgconf0
5 files changed, 9 insertions, 4 deletions
diff --git a/.gitmodules b/.gitmodules
index 7d5212c..da031f6 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -25,3 +25,6 @@
path = libodb-sqlite
url = http://scm.codesynthesis.com/odb/libodb-sqlite.git
update = none
+[submodule "libpkgconf"]
+ path = libpkgconf
+ url = http://git.build2.org/packaging/pkgconf/libpkgconf.git
diff --git a/README-GIT b/README-GIT
index 70c5b0a..f4537d3 100644
--- a/README-GIT
+++ b/README-GIT
@@ -24,8 +24,8 @@ 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 libsqlite3 and libodb* submodules are not updated by default (e.g.,
- with the above command). This is achieved with:
+2. The libpkgconf, libsqlite3 and libodb* submodules are not updated by default
+ (e.g., with the above command). This is achieved with:
git config --file .gitmodules submodule.libsqlite3.update none
diff --git a/build/bootstrap.build b/build/bootstrap.build
index 51063de..855ba67 100644
--- a/build/bootstrap.build
+++ b/build/bootstrap.build
@@ -3,7 +3,8 @@
# license : MIT; see accompanying LICENSE file
project = build2-toolchain
-subprojects = libbutl build2 libsqlite3 libodb libodb-sqlite libbpkg bpkg
+subprojects = libpkgconf libbutl build2 \
+libsqlite3 libodb libodb-sqlite libbpkg bpkg
using version
using config
diff --git a/buildfile b/buildfile
index f1c176f..23aa74f 100644
--- a/buildfile
+++ b/buildfile
@@ -5,7 +5,8 @@
# Note that the project directories order is important (prerequisites goes
# first).
#
-d = libbutl/ build2/ libsqlite3/ libodb/ libodb-sqlite/ libbpkg/ bpkg/ doc/
+d = libpkgconf/ libbutl/ build2/ \
+libsqlite3/ libodb/ libodb-sqlite/ libbpkg/ bpkg/ doc/
i = \
INSTALL \
diff --git a/libpkgconf b/libpkgconf
new file mode 160000
+Subproject a8e4f1dbbd4d2f293fe8b3d507e5feab6e20a68