From 9e842f70578c64cbfe0daecb6f60bf846254f365 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Thu, 15 Oct 2015 13:19:35 +0200 Subject: [PATCH] sqlite 3.9.0 * also add fts5, json1 options * fix enabling options after sqlite commit https://www.sqlite.org/src/info/9e92a5ed5aaba20461ed4ce8359d6e34e7773d68 Closes Homebrew/homebrew#44986. Signed-off-by: Dominyk Tiller --- Formula/sqlite.rb | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/Formula/sqlite.rb b/Formula/sqlite.rb index 724f16b885..e47115b66f 100644 --- a/Formula/sqlite.rb +++ b/Formula/sqlite.rb @@ -1,9 +1,9 @@ class Sqlite < Formula desc "Command-line interface for SQLite" homepage "https://sqlite.org/" - url "https://sqlite.org/2015/sqlite-autoconf-3081101.tar.gz" - sha256 "fb99b0ac038c4a7e48b44b61836cb41d4eeba36b4d0ee757beeab59031a1d3b6" - version "3.8.11.1" + url "https://sqlite.org/2015/sqlite-autoconf-3090000.tar.gz" + sha256 "a324143f4cc35cd7e9605a0a8dec9f9e4861d0be8305f3642e7d05008b77e60d" + version "3.9.0" bottle do cellar :any @@ -18,12 +18,14 @@ class Sqlite < Formula option :universal option "with-docs", "Install HTML documentation" option "without-rtree", "Disable the R*Tree index module" - option "with-fts", "Enable the FTS module" + option "with-fts", "Enable the FTS3 module" + option "with-fts5", "Enable the FTS5 module (experimental)" option "with-secure-delete", "Defaults secure_delete to on" option "with-unlock-notify", "Enable the unlock notification feature" option "with-icu4c", "Enable the ICU module" option "with-functions", "Enable more math and string functions for SQL queries" option "with-dbstat", "Enable the 'dbstat' virtual table" + option "with-json1", "Enable the JSON1 extension" depends_on "readline" => :recommended depends_on "icu4c" => :optional @@ -35,18 +37,20 @@ class Sqlite < Formula end resource "docs" do - url "https://sqlite.org/2015/sqlite-doc-3081101.zip" - version "3.8.11.1" - sha256 "89e3fc4bce7463885da3b03602b4260fe07240f9ea674ba4ac7ce2ee4987357f" + url "https://sqlite.org/2015/sqlite-doc-3090000.zip" + version "3.9.0" + sha256 "2b5f4116b16907ab087548047c0489e4cc8124e249b3f8c55005098db863be17" end def install - ENV.append "CPPFLAGS", "-DSQLITE_ENABLE_RTREE" if build.with? "rtree" - ENV.append "CPPFLAGS", "-DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS" if build.with? "fts" - ENV.append "CPPFLAGS", "-DSQLITE_ENABLE_COLUMN_METADATA" - ENV.append "CPPFLAGS", "-DSQLITE_SECURE_DELETE" if build.with? "secure-delete" - ENV.append "CPPFLAGS", "-DSQLITE_ENABLE_UNLOCK_NOTIFY" if build.with? "unlock-notify" - ENV.append "CPPFLAGS", "-DSQLITE_ENABLE_DBSTAT_VTAB" if build.with? "dbstat" + ENV.append "CPPFLAGS", "-DSQLITE_ENABLE_RTREE=1" if build.with? "rtree" + ENV.append "CPPFLAGS", "-DSQLITE_ENABLE_FTS3=1 -DSQLITE_ENABLE_FTS3_PARENTHESIS=1" if build.with? "fts" + ENV.append "CPPFLAGS", "-DSQLITE_ENABLE_FTS5=1" if build.with? "fts5" + ENV.append "CPPFLAGS", "-DSQLITE_ENABLE_COLUMN_METADATA=1" + ENV.append "CPPFLAGS", "-DSQLITE_SECURE_DELETE=1" if build.with? "secure-delete" + ENV.append "CPPFLAGS", "-DSQLITE_ENABLE_UNLOCK_NOTIFY=1" if build.with? "unlock-notify" + ENV.append "CPPFLAGS", "-DSQLITE_ENABLE_DBSTAT_VTAB=1" if build.with? "dbstat" + ENV.append "CPPFLAGS", "-DSQLITE_ENABLE_JSON1=1" if build.with? "json1" if build.with? "icu4c" icu4c = Formula["icu4c"] @@ -54,7 +58,7 @@ class Sqlite < Formula icu4ccppflags = `#{icu4c.opt_bin}/icu-config --cppflags`.tr("\n", " ") ENV.append "LDFLAGS", icu4cldflags ENV.append "CPPFLAGS", icu4ccppflags - ENV.append "CPPFLAGS", "-DSQLITE_ENABLE_ICU" + ENV.append "CPPFLAGS", "-DSQLITE_ENABLE_ICU=1" end ENV.universal_binary if build.universal?