aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--LICENSE23
-rw-r--r--manifest2
2 files changed, 21 insertions, 4 deletions
diff --git a/LICENSE b/LICENSE
index f22e52f..8065dbc 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,16 +1,33 @@
libbutl/sha1.c:
-3-clause BSD License; see the file header for details.
+ 3-clause BSD License; see the file header for details.
libbutl/{sha256c.c, strptime.c, timelocal.[hc]}:
libbutl/{xxhash.[hc], lz4*.[hc]}:
libbutl/mingw-*.hxx:
-2-clause BSD License; see the file headers for details.
+ 2-clause BSD License; see the file headers for details.
libbutl/json/pdjson.[hc]:
-UNLICENSE (dedicated to the public domain).
+ UNLICENSE (dedicated to the public domain).
+
+libbutl-pkg-config/**.[hc]:
+
+ ISC License (see upstream/libpkg-config/LICENSE for details).
+
+libbutl-odb/sqlite/*.[hc]:
+
+ SQLite Blessing (see upstream/sqlite/ for details).
+
+libbutl-odb/odb/{**.h **.?xx}:
+
+ GPLv2 with License Exception which allows the use of the original build2
+ software in open source or proprietary works without imposing any additional
+ restrictions to the terms and conditions of the MIT license used by build2.
+ For details, see:
+
+ https://git.codesynthesis.com/cgit/odb/odb-etc/tree/license-exceptions/build2-odb-license-exception.txt
The rest:
diff --git a/manifest b/manifest
index 7ac415a..7bd2d3d 100644
--- a/manifest
+++ b/manifest
@@ -3,7 +3,7 @@ name: libbutl
version: 0.17.0-a.0.z
project: build2
summary: build2 utility library
-license: MIT AND BSD-3-Clause AND BSD-2-Clause ; MIT except for files from the FreeBSD, LZ4, and mingw-std-threads projects.
+license: MIT AND BSD-3-Clause AND BSD-2-Clause AND ISC AND blessing; MIT except for files from other projects (all permissively licensed).
topics: build toolchain
description-file: README
changes-file: NEWS