From ba97a23a7f0670fd1ff44e16ba61d10f66c6899d Mon Sep 17 00:00:00 2001 From: Gert-Jan Timmer Date: Wed, 23 May 2018 22:20:06 +0200 Subject: Rename Renamed files containing current features. --- sqlite3_opt_icu.go | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 sqlite3_opt_icu.go (limited to 'sqlite3_opt_icu.go') diff --git a/sqlite3_opt_icu.go b/sqlite3_opt_icu.go new file mode 100644 index 0000000..e960626 --- /dev/null +++ b/sqlite3_opt_icu.go @@ -0,0 +1,13 @@ +// Copyright (C) 2014 Yasuhiro Matsumoto . +// +// Use of this source code is governed by an MIT-style +// license that can be found in the LICENSE file. +// +build icu + +package sqlite3 + +/* +#cgo LDFLAGS: -licuuc -licui18n +#cgo CFLAGS: -DSQLITE_ENABLE_ICU +*/ +import "C" -- cgit v1.2.3 From 765f6e93d28885358c2b14c885a63424d8bd68a8 Mon Sep 17 00:00:00 2001 From: Gert-Jan Timmer Date: Thu, 24 May 2018 11:55:02 +0200 Subject: Update prefix of build tags to `sqlite_` * Keep current build tags backwards compliant * Added alias for `sqlite_json1` => `sqlite_json` --- sqlite3_opt_fts5.go | 2 +- sqlite3_opt_icu.go | 2 +- sqlite3_opt_json1.go | 2 +- sqlite3_opt_vtable.go | 2 +- sqlite3_opt_vtable_test.go | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) (limited to 'sqlite3_opt_icu.go') diff --git a/sqlite3_opt_fts5.go b/sqlite3_opt_fts5.go index 0e65d69..9126272 100644 --- a/sqlite3_opt_fts5.go +++ b/sqlite3_opt_fts5.go @@ -2,7 +2,7 @@ // // Use of this source code is governed by an MIT-style // license that can be found in the LICENSE file. -// +build fts5 +// +build sqlite_fts5 fts5 package sqlite3 diff --git a/sqlite3_opt_icu.go b/sqlite3_opt_icu.go index e960626..8807aef 100644 --- a/sqlite3_opt_icu.go +++ b/sqlite3_opt_icu.go @@ -2,7 +2,7 @@ // // Use of this source code is governed by an MIT-style // license that can be found in the LICENSE file. -// +build icu +// +build sqlite_icu icu package sqlite3 diff --git a/sqlite3_opt_json1.go b/sqlite3_opt_json1.go index a7b2473..993f037 100644 --- a/sqlite3_opt_json1.go +++ b/sqlite3_opt_json1.go @@ -2,7 +2,7 @@ // // Use of this source code is governed by an MIT-style // license that can be found in the LICENSE file. -// +build json1 +// +build sqlite_json sqlite_json1 json1 package sqlite3 diff --git a/sqlite3_opt_vtable.go b/sqlite3_opt_vtable.go index 8bef291..3391756 100644 --- a/sqlite3_opt_vtable.go +++ b/sqlite3_opt_vtable.go @@ -2,7 +2,7 @@ // // Use of this source code is governed by an MIT-style // license that can be found in the LICENSE file. -// +build vtable +// +build sqlite_vtable vtable package sqlite3 diff --git a/sqlite3_opt_vtable_test.go b/sqlite3_opt_vtable_test.go index ce6a48c..51dcd0f 100644 --- a/sqlite3_opt_vtable_test.go +++ b/sqlite3_opt_vtable_test.go @@ -2,7 +2,7 @@ // // Use of this source code is governed by an MIT-style // license that can be found in the LICENSE file. -// +build vtable +// +build sqlite_vtable vtable package sqlite3 -- cgit v1.2.3 From 5abd024785fc4b5916fa6296a7c4542d2ec07fbe Mon Sep 17 00:00:00 2001 From: Gert-Jan Timmer Date: Fri, 25 May 2018 11:41:14 +0200 Subject: Fix: OSX icu module --- .travis.yml | 2 +- sqlite3_opt_icu.go | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'sqlite3_opt_icu.go') diff --git a/.travis.yml b/.travis.yml index 4071647..914e92e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -157,7 +157,7 @@ before_install: - | if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update - brew install icu4c + brew upgrade icu4c fi - | if [[ "${GOOS}" != "windows" ]]; then diff --git a/sqlite3_opt_icu.go b/sqlite3_opt_icu.go index 8807aef..9bc0c61 100644 --- a/sqlite3_opt_icu.go +++ b/sqlite3_opt_icu.go @@ -9,5 +9,7 @@ package sqlite3 /* #cgo LDFLAGS: -licuuc -licui18n #cgo CFLAGS: -DSQLITE_ENABLE_ICU +#cgo darwin CFLAGS: -I/usr/local/opt/icu4c/include +#cgo darwin LDFLAGS: -L/usr/local/opt/icu4c/lib */ import "C" -- cgit v1.2.3