From 330ffb995ec9ead9c53cd477e11887e5f9d982dc Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Thu, 1 Sep 2016 07:49:52 +0200
Subject: Build system updates

---
 sqlite3/buildfile | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

(limited to 'sqlite3')

diff --git a/sqlite3/buildfile b/sqlite3/buildfile
index 98c0ee6..8fc111b 100644
--- a/sqlite3/buildfile
+++ b/sqlite3/buildfile
@@ -2,14 +2,7 @@
 # copyright : not copyrighted - public domain
 
 lib{sqlite3}: {h c}{sqlite3} h{sqlite3ext}
-
-# For pre-releases use the complete version to make sure they cannot be used
-# in place of another pre-release or the final version.
-#
-if $abi_prerelease
-  lib{sqlite3}: bin.lib.version = @-$version
-else
-  lib{sqlite3}: bin.lib.version = @-$abi_major.$abi_minor
+lib{sqlite3}: bin.lib.version = @-$abi_major # See bootstrap.build.
 
 # The set of features we enable by default is inspired by Debian, Fedora, and
 # the official documentation.
@@ -20,7 +13,10 @@ else
 #
 # PREUPDATE_HOOK is required by SESSION
 #
-# -DSQLITE_ENABLE_SESSION=1 removed due to bug in 3.14.1.
+# -DSQLITE_ENABLE_SESSION=1 removed for now due to bug in 3.14.1.
+#
+# Note that if disabling any previously-released features, then will need to
+# increment abi_major.
 #
 cc.poptions =+ \
 -DSQLITE_THREADSAFE=1 \
@@ -36,8 +32,6 @@ cc.poptions =+ \
 -DSQLITE_ENABLE_COLUMN_METADATA=1 \
 -DSQLITE_ENABLE_FTS3_PARENTHESIS=1
 
-c.poptions += -I$src_base
-
 if ($c.target.class != "windows")
 {
   cc.poptions =+ -DHAVE_USLEEP=1
-- 
cgit v1.1