diff options
| -rw-r--r-- | .gitmodules | 3 | ||||
| -rw-r--r-- | README-GIT | 13 | ||||
| -rw-r--r-- | build/bootstrap.build | 2 | ||||
| -rw-r--r-- | buildfile | 2 | ||||
| l--------- | libpkg-config | 1 | ||||
| m--------- | submodules/libpkg-config | 0 |
6 files changed, 2 insertions, 19 deletions
diff --git a/.gitmodules b/.gitmodules index b95cbe3..7f7ef04 100644 --- a/.gitmodules +++ b/.gitmodules @@ -34,6 +34,3 @@ [submodule "submodules/libbuild2-autoconf"] path = submodules/libbuild2-autoconf url = https://github.com/build2/libbuild2-autoconf.git -[submodule "submodules/libpkg-config"] - path = submodules/libpkg-config - url = https://github.com/build2/libpkg-config.git @@ -24,16 +24,3 @@ A few additional notes: see the '(new commits, modified content)' status instead of just '(new commits)' next to submodules (i.e., git "thinks" you have modified the member project by "setting back" its subproject commit). - -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 - - Instead, their updates (normally to something tagged) must be requested - explicitly: - - git submodule update --remote --checkout submodules/sqlite - - Note that you need a fairly recent git (e.g., 2.9) for this enforcement - to work. diff --git a/build/bootstrap.build b/build/bootstrap.build index 183578f..e965af7 100644 --- a/build/bootstrap.build +++ b/build/bootstrap.build @@ -8,7 +8,7 @@ amalgamation = # Disable amalgamation. # Note: list them (mostly) explicitly without using wildcards to handle stray # subdirectories in the root (debian/, installation location, etc). # -subprojects += libpkg-config/ libbutl/ build2/ libsqlite3/ libodb/ \ +subprojects += libbutl/ build2/ libsqlite3/ libodb/ \ libodb-sqlite/ libbpkg/ bpkg/ bdep/ subprojects += libbuild2-*/ subprojects += tests/*/ @@ -21,7 +21,7 @@ build2_repo="https://stage.build2.org/1" # # NOTE: see also subprojects in bootstrap.build if changing anything here. # -d = libpkg-config/ libbutl/ build2/ libsqlite3/ libodb/ libodb-sqlite/ \ +d = libbutl/ build2/ libsqlite3/ libodb/ libodb-sqlite/ \ libbpkg/ bpkg/ bdep/ doc/ libbuild2-*/ if ($build.meta_operation == 'dist') diff --git a/libpkg-config b/libpkg-config deleted file mode 120000 index 9e074db..0000000 --- a/libpkg-config +++ /dev/null @@ -1 +0,0 @@ -submodules/libpkg-config/libpkg-config
\ No newline at end of file diff --git a/submodules/libpkg-config b/submodules/libpkg-config deleted file mode 160000 -Subproject a85bff812c83141bd5c3918857b190b0da6717a |