diff options
| -rw-r--r-- | libbuild2/cc/buildfile | 2 | ||||
| -rw-r--r-- | libbuild2/dist/operation.cxx | 2 | ||||
| -rw-r--r-- | libbuild2/file.cxx | 11 | ||||
| -rw-r--r-- | manifest | 1 | ||||
| -rw-r--r-- | repositories.manifest | 4 |
5 files changed, 11 insertions, 9 deletions
diff --git a/libbuild2/cc/buildfile b/libbuild2/cc/buildfile index 7dcd811..654d0a4 100644 --- a/libbuild2/cc/buildfile +++ b/libbuild2/cc/buildfile @@ -11,7 +11,7 @@ libpkgconf = $config.build2.libpkgconf if $libpkgconf import impl_libs += libpkgconf%lib{pkgconf} else - import impl_libs += libpkg-config%lib{pkg-config} + import impl_libs += libbutl%lib{butl-pkg-config} include ../bin/ intf_libs = ../bin/lib{build2-bin} diff --git a/libbuild2/dist/operation.cxx b/libbuild2/dist/operation.cxx index cd88eac..cfc90cf 100644 --- a/libbuild2/dist/operation.cxx +++ b/libbuild2/dist/operation.cxx @@ -156,7 +156,7 @@ namespace build2 { const path& n (e.path ()); - if (n.string ()[0] != '.') + if (!n.empty () && n.string ().front () != '.') try { if (e.type () == entry_type::directory) // Can throw. diff --git a/libbuild2/file.cxx b/libbuild2/file.cxx index c0957ad..18147a2 100644 --- a/libbuild2/file.cxx +++ b/libbuild2/file.cxx @@ -859,6 +859,13 @@ namespace build2 for (const dir_entry& de: dir_iterator (d, dir_iterator::detect_dangling)) { + const path& n (de.path ()); + + // Skip hidden entries. + // + if (n.empty () || n.string ().front () == '.') + continue; + if (de.type () != entry_type::directory) { if (de.type () == entry_type::unknown) @@ -867,13 +874,13 @@ namespace build2 warn << "skipping " << (sl ? "dangling symlink" : "inaccessible entry") << ' ' - << d / de.path (); + << d / n; } continue; } - dir_path sd (d / path_cast<dir_path> (de.path ())); + dir_path sd (d / path_cast<dir_path> (n)); bool src (false); optional<bool> altn; @@ -19,4 +19,3 @@ depends: * bpkg >= 0.16.0- # @@ DEP Should probably become conditional dependency. #requires: ? cli ; Only required if changing .cli files. depends: libbutl [0.17.0-a.0.1 0.17.0-a.1) -depends: libpkg-config ~0.1.1 diff --git a/repositories.manifest b/repositories.manifest index 81d0645..3d857bc 100644 --- a/repositories.manifest +++ b/repositories.manifest @@ -4,7 +4,3 @@ summary: build2 build system repository : role: prerequisite location: ../libbutl.git##HEAD - -: -role: prerequisite -location: https://github.com/build2/libpkg-config.git##HEAD |