Skip to content

Commit 670bba5

Browse files
gjrtimmergjrtimmer
committed
Merge branch 'fix/darwin-icu' into update/options
2 parents 59885cf + 2cee2f9 commit 670bba5

File tree

2 files changed

+7
-78
lines changed

2 files changed

+7
-78
lines changed

‎.travis.yml

Lines changed: 5 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@ env:
1212
matrix:
1313
- GOTAGS=
1414
- GOTAGS=libsqlite3
15-
- GOTAGS="sqlite_allow_uri_authority sqlite_app_armor sqlite_foreign_keys sqlite_fts5 sqlite_icu sqlite_introspect sqlite_json sqlite_secure_delete sqlite_see sqlite_stat4 sqlite_userauth"
16-
- GOTAGS=sqlite_trace
15+
- GOTAGS="sqlite_allow_uri_authority sqlite_app_armor sqlite_foreign_keys sqlite_fts5 sqlite_icu sqlite_introspect sqlite_json sqlite_secure_delete sqlite_see sqlite_stat4 sqlite_trace sqlite_userauth"
1716
- GOTAGS=sqlite_vacuum_full
1817
- GOTAGS=sqlite_vacuum_incr
1918
- GOTAGS=sqlite_vtable
@@ -25,129 +24,57 @@ go:
2524

2625
matrix:
2726
include:
28-
- os: linux
29-
go: 1.8.x
30-
env: GOTAGS= GOOS=windows GOARCH=386
3127
- os: linux
3228
go: 1.8.x
3329
env: GOTAGS= GOOS=windows GOARCH=amd64
34-
- os: linux
35-
go: 1.8.x
36-
env: GOTAGS=libsqlite3 GOOS=windows GOARCH=386
3730
- os: linux
3831
go: 1.8.x
3932
env: GOTAGS=libsqlite3 GOOS=windows GOARCH=amd64
4033
- os: linux
4134
go: 1.8.x
42-
env: GOTAGS="sqlite_allow_uri_authority sqlite_app_armor sqlite_foreign_keys sqlite_fts5 sqlite_icu sqlite_introspect sqlite_json sqlite_secure_delete sqlite_see sqlite_stat4 sqlite_userauth" GOOS=windows GOARCH=386
43-
- os: linux
44-
go: 1.8.x
45-
env: GOTAGS="sqlite_allow_uri_authority sqlite_app_armor sqlite_foreign_keys sqlite_fts5 sqlite_icu sqlite_introspect sqlite_json sqlite_secure_delete sqlite_see sqlite_stat4 sqlite_userauth" GOOS=windows GOARCH=amd64
46-
- os: linux
47-
go: 1.8.x
48-
env: GOTAGS=sqlite_trace GOOS=windows GOARCH=386
49-
- os: linux
50-
go: 1.8.x
51-
env: GOTAGS=sqlite_trace GOOS=windows GOARCH=amd64
52-
- os: linux
53-
go: 1.8.x
54-
env: GOTAGS=sqlite_vacuum_full GOOS=windows GOARCH=386
35+
env: GOTAGS="sqlite_allow_uri_authority sqlite_app_armor sqlite_foreign_keys sqlite_fts5 sqlite_icu sqlite_introspect sqlite_json sqlite_secure_delete sqlite_see sqlite_stat4 sqlite_trace sqlite_userauth" GOOS=windows GOARCH=amd64
5536
- os: linux
5637
go: 1.8.x
5738
env: GOTAGS=sqlite_vacuum_full GOOS=windows GOARCH=amd64
58-
- os: linux
59-
go: 1.8.x
60-
env: GOTAGS=sqlite_vacuum_incr GOOS=windows GOARCH=386
6139
- os: linux
6240
go: 1.8.x
6341
env: GOTAGS=sqlite_vacuum_incr GOOS=windows GOARCH=amd64
64-
- os: linux
65-
go: 1.8.x
66-
env: GOTAGS=sqlite_vtable GOOS=windows GOARCH=386
6742
- os: linux
6843
go: 1.8.x
6944
env: GOTAGS=sqlite_vtable GOOS=windows GOARCH=amd64
70-
- os: linux
71-
go: 1.9.x
72-
env: GOTAGS= GOOS=windows GOARCH=386
7345
- os: linux
7446
go: 1.9.x
7547
env: GOTAGS= GOOS=windows GOARCH=amd64
76-
- os: linux
77-
go: 1.9.x
78-
env: GOTAGS=libsqlite3 GOOS=windows GOARCH=386
7948
- os: linux
8049
go: 1.9.x
8150
env: GOTAGS=libsqlite3 GOOS=windows GOARCH=amd64
8251
- os: linux
8352
go: 1.9.x
84-
env: GOTAGS="sqlite_allow_uri_authority sqlite_app_armor sqlite_foreign_keys sqlite_fts5 sqlite_icu sqlite_introspect sqlite_json sqlite_secure_delete sqlite_see sqlite_stat4 sqlite_userauth" GOOS=windows GOARCH=386
85-
- os: linux
86-
go: 1.9.x
87-
env: GOTAGS="sqlite_allow_uri_authority sqlite_app_armor sqlite_foreign_keys sqlite_fts5 sqlite_icu sqlite_introspect sqlite_json sqlite_secure_delete sqlite_see sqlite_stat4 sqlite_userauth" GOOS=windows GOARCH=amd64
88-
- os: linux
89-
go: 1.9.x
90-
env: GOTAGS=sqlite_trace GOOS=windows GOARCH=386
91-
- os: linux
92-
go: 1.9.x
93-
env: GOTAGS=sqlite_trace GOOS=windows GOARCH=amd64
94-
- os: linux
95-
go: 1.9.x
96-
env: GOTAGS=sqlite_vacuum_full GOOS=windows GOARCH=386
53+
env: GOTAGS="sqlite_allow_uri_authority sqlite_app_armor sqlite_foreign_keys sqlite_fts5 sqlite_icu sqlite_introspect sqlite_json sqlite_secure_delete sqlite_see sqlite_stat4 sqlite_trace sqlite_userauth" GOOS=windows GOARCH=amd64
9754
- os: linux
9855
go: 1.9.x
9956
env: GOTAGS=sqlite_vacuum_full GOOS=windows GOARCH=amd64
100-
- os: linux
101-
go: 1.9.x
102-
env: GOTAGS=sqlite_vacuum_incr GOOS=windows GOARCH=386
10357
- os: linux
10458
go: 1.9.x
10559
env: GOTAGS=sqlite_vacuum_incr GOOS=windows GOARCH=amd64
106-
- os: linux
107-
go: 1.9.x
108-
env: GOTAGS=sqlite_vtable GOOS=windows GOARCH=386
10960
- os: linux
11061
go: 1.9.x
11162
env: GOTAGS=sqlite_vtable GOOS=windows GOARCH=amd64
112-
- os: linux
113-
go: 1.10.x
114-
env: GOTAGS= GOOS=windows GOARCH=386
11563
- os: linux
11664
go: 1.10.x
11765
env: GOTAGS= GOOS=windows GOARCH=amd64
118-
- os: linux
119-
go: 1.10.x
120-
env: GOTAGS=libsqlite3 GOOS=windows GOARCH=386
12166
- os: linux
12267
go: 1.10.x
12368
env: GOTAGS=libsqlite3 GOOS=windows GOARCH=amd64
12469
- os: linux
12570
go: 1.10.x
126-
env: GOTAGS="sqlite_allow_uri_authority sqlite_app_armor sqlite_foreign_keys sqlite_fts5 sqlite_icu sqlite_introspect sqlite_json sqlite_secure_delete sqlite_see sqlite_stat4 sqlite_userauth" GOOS=windows GOARCH=386
127-
- os: linux
128-
go: 1.10.x
129-
env: GOTAGS="sqlite_allow_uri_authority sqlite_app_armor sqlite_foreign_keys sqlite_fts5 sqlite_icu sqlite_introspect sqlite_json sqlite_secure_delete sqlite_see sqlite_stat4 sqlite_userauth" GOOS=windows GOARCH=amd64
130-
- os: linux
131-
go: 1.10.x
132-
env: GOTAGS=sqlite_trace GOOS=windows GOARCH=386
133-
- os: linux
134-
go: 1.10.x
135-
env: GOTAGS=sqlite_trace GOOS=windows GOARCH=amd64
136-
- os: linux
137-
go: 1.10.x
138-
env: GOTAGS=sqlite_vacuum_full GOOS=windows GOARCH=386
71+
env: GOTAGS="sqlite_allow_uri_authority sqlite_app_armor sqlite_foreign_keys sqlite_fts5 sqlite_icu sqlite_introspect sqlite_json sqlite_secure_delete sqlite_see sqlite_stat4 sqlite_trace sqlite_userauth" GOOS=windows GOARCH=amd64
13972
- os: linux
14073
go: 1.10.x
14174
env: GOTAGS=sqlite_vacuum_full GOOS=windows GOARCH=amd64
142-
- os: linux
143-
go: 1.10.x
144-
env: GOTAGS=sqlite_vacuum_incr GOOS=windows GOARCH=386
14575
- os: linux
14676
go: 1.10.x
14777
env: GOTAGS=sqlite_vacuum_incr GOOS=windows GOARCH=amd64
148-
- os: linux
149-
go: 1.10.x
150-
env: GOTAGS=sqlite_vtable GOOS=windows GOARCH=386
15178
- os: linux
15279
go: 1.10.x
15380
env: GOTAGS=sqlite_vtable GOOS=windows GOARCH=amd64
@@ -157,7 +84,7 @@ before_install:
15784
- |
15885
if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
15986
brew update
160-
brew install icu4c
87+
brew upgrade icu4c
16188
fi
16289
- |
16390
if [[ "${GOOS}" != "windows" ]]; then

‎sqlite3_opt_icu.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,7 @@ package sqlite3
99
/*
1010
#cgo LDFLAGS: -licuuc -licui18n
1111
#cgo CFLAGS: -DSQLITE_ENABLE_ICU
12+
#cgo darwin CFLAGS: -I/usr/local/opt/icu4c/include
13+
#cgo darwin LDFLAGS: -L/usr/local/opt/icu4c/lib
1214
*/
1315
import "C"

0 commit comments

Comments
 (0)