summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKaren Arutyunov <karen@codesynthesis.com>2019-03-05 22:07:42 (GMT)
committerKaren Arutyunov <karen@codesynthesis.com>2019-03-05 22:07:42 (GMT)
commitaa5ecc3b21bf88c5b9b9c17912e4efbd96eeab34 (patch)
tree840dd355625401740eba506d12cfa28786fc568f
parentd5d8bb4e043fc6c0292f1ce46fc95233b97f3835 (diff)
Release version 3.18.2+6
-rw-r--r--libsqlite3/buildfile33
-rw-r--r--manifest8
2 files changed, 26 insertions, 15 deletions
diff --git a/libsqlite3/buildfile b/libsqlite3/buildfile
index 707f307..d8c2913 100644
--- a/libsqlite3/buildfile
+++ b/libsqlite3/buildfile
@@ -3,13 +3,15 @@
lib{sqlite3}: {h c}{*}
-# See bootstrap.build for details.
-#
-if $version.pre_release
- lib{sqlite3}: bin.lib.version = @"-$version.project_id"
-else
- lib{sqlite3}: bin.lib.version = @"-$abi_major"
+tclass = $c.target.class
+
+bsd = ($tclass == 'bsd')
+windows = ($tclass == 'windows')
+gcc = ($c.class == 'gcc')
+
+# Build options.
+#
# The set of features we enable by default is inspired by Debian, Fedora, and
# the official documentation.
#
@@ -38,7 +40,7 @@ cc.poptions =+ \
-DSQLITE_ENABLE_COLUMN_METADATA=1 \
-DSQLITE_ENABLE_FTS3_PARENTHESIS=1
-if ($c.target.class != "windows")
+if! $windows
{
cc.poptions =+ -DHAVE_USLEEP=1
@@ -58,13 +60,13 @@ if ($c.target.class != "windows")
#
c.libs += -lpthread -lm
- if ($c.target.class != "bsd")
+ if! $bsd
c.libs += -ldl
}
# Both Debian and Fedora add this so gotta be important.
#
-if ($c.class == 'gcc')
+if $gcc
c.coptions += -fno-strict-aliasing
# Disable warnings that pop up with -Wextra. Upstream doesn't seem to care
@@ -74,17 +76,26 @@ if ($c.class == 'gcc')
# platforms/compilers. We pass them through but disable treating them as
# errors.
#
-if ($c.class == 'gcc')
+if $gcc
c.coptions += -Wno-extra -Wno-error
+# Export options.
+#
# It would have been cleaner to handle this in a header but that will require
# modifying sqlite3.h. Note that this is also sub-optimal if we are not using
# an export stub (no dllimport).
#
lib{sqlite3}: cc.export.poptions = "-I$src_base"
-if ($c.target.class == "windows")
+if $windows
{
objs{*}: c.poptions += '-DSQLITE_API=__declspec(dllexport)'
libs{sqlite3}: cc.export.poptions += '-DSQLITE_API=__declspec(dllimport)'
}
+
+# See bootstrap.build for details.
+#
+if $version.pre_release
+ lib{sqlite3}: bin.lib.version = @"-$version.project_id"
+else
+ lib{sqlite3}: bin.lib.version = @"-$abi_major"
diff --git a/manifest b/manifest
index 60db37f..e7b04be 100644
--- a/manifest
+++ b/manifest
@@ -1,6 +1,6 @@
: 1
name: libsqlite3
-version: 3.18.2+5
+version: 3.18.2+6
project: sqlite
summary: SQL database engine as an in-process C library
license: public domain
@@ -13,6 +13,6 @@ package-url: https://git.build2.org/cgit/packaging/sqlite/
email: sqlite-users@mailinglists.sqlite.org ; Mailing list.
package-email: packaging@build2.org ; Mailing list.
build-email: builds@build2.org
-#builds: all
-depends: * build2 >= 0.8.0-
-depends: * bpkg >= 0.8.0-
+builds: all
+depends: * build2 >= 0.9.0
+depends: * bpkg >= 0.9.0