diff options
| author | Gert-Jan Timmer <gjr.timmer@gmail.com> | 2018-05-25 12:24:53 +0200 |
|---|---|---|
| committer | Gert-Jan Timmer <gjr.timmer@gmail.com> | 2018-05-25 12:24:53 +0200 |
| commit | 670bba5d74c06a539dc115b30bcf71a15603c40e (patch) | |
| tree | f49b47f4a19b384563e22ba7165c2efeb64d41f3 | |
| parent | Reduced build time (diff) | |
| parent | Update Travis CI (diff) | |
| download | golite-670bba5d74c06a539dc115b30bcf71a15603c40e.tar.gz golite-670bba5d74c06a539dc115b30bcf71a15603c40e.tar.xz | |
Merge branch 'fix/darwin-icu' into update/options
| -rw-r--r-- | .travis.yml | 83 | ||||
| -rw-r--r-- | sqlite3_opt_icu.go | 2 |
2 files changed, 7 insertions, 78 deletions
diff --git a/.travis.yml b/.travis.yml index 4071647..ba8c891 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,8 +12,7 @@ env: matrix: - GOTAGS= - GOTAGS=libsqlite3 - - 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" - - GOTAGS=sqlite_trace + - 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" - GOTAGS=sqlite_vacuum_full - GOTAGS=sqlite_vacuum_incr - GOTAGS=sqlite_vtable @@ -27,129 +26,57 @@ matrix: include: - os: linux go: 1.8.x - env: GOTAGS= GOOS=windows GOARCH=386 - - os: linux - go: 1.8.x env: GOTAGS= GOOS=windows GOARCH=amd64 - os: linux go: 1.8.x - env: GOTAGS=libsqlite3 GOOS=windows GOARCH=386 - - os: linux - go: 1.8.x env: GOTAGS=libsqlite3 GOOS=windows GOARCH=amd64 - os: linux go: 1.8.x - 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 - - os: linux - go: 1.8.x - 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 - - os: linux - go: 1.8.x - env: GOTAGS=sqlite_trace GOOS=windows GOARCH=386 - - os: linux - go: 1.8.x - env: GOTAGS=sqlite_trace GOOS=windows GOARCH=amd64 - - os: linux - go: 1.8.x - env: GOTAGS=sqlite_vacuum_full GOOS=windows GOARCH=386 + 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 - os: linux go: 1.8.x env: GOTAGS=sqlite_vacuum_full GOOS=windows GOARCH=amd64 - os: linux go: 1.8.x - env: GOTAGS=sqlite_vacuum_incr GOOS=windows GOARCH=386 - - os: linux - go: 1.8.x env: GOTAGS=sqlite_vacuum_incr GOOS=windows GOARCH=amd64 - os: linux go: 1.8.x - env: GOTAGS=sqlite_vtable GOOS=windows GOARCH=386 - - os: linux - go: 1.8.x env: GOTAGS=sqlite_vtable GOOS=windows GOARCH=amd64 - os: linux go: 1.9.x - env: GOTAGS= GOOS=windows GOARCH=386 - - os: linux - go: 1.9.x env: GOTAGS= GOOS=windows GOARCH=amd64 - os: linux go: 1.9.x - env: GOTAGS=libsqlite3 GOOS=windows GOARCH=386 - - os: linux - go: 1.9.x env: GOTAGS=libsqlite3 GOOS=windows GOARCH=amd64 - os: linux go: 1.9.x - 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 - - os: linux - go: 1.9.x - 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 - - os: linux - go: 1.9.x - env: GOTAGS=sqlite_trace GOOS=windows GOARCH=386 - - os: linux - go: 1.9.x - env: GOTAGS=sqlite_trace GOOS=windows GOARCH=amd64 - - os: linux - go: 1.9.x - env: GOTAGS=sqlite_vacuum_full GOOS=windows GOARCH=386 + 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 - os: linux go: 1.9.x env: GOTAGS=sqlite_vacuum_full GOOS=windows GOARCH=amd64 - os: linux go: 1.9.x - env: GOTAGS=sqlite_vacuum_incr GOOS=windows GOARCH=386 - - os: linux - go: 1.9.x env: GOTAGS=sqlite_vacuum_incr GOOS=windows GOARCH=amd64 - os: linux go: 1.9.x - env: GOTAGS=sqlite_vtable GOOS=windows GOARCH=386 - - os: linux - go: 1.9.x env: GOTAGS=sqlite_vtable GOOS=windows GOARCH=amd64 - os: linux go: 1.10.x - env: GOTAGS= GOOS=windows GOARCH=386 - - os: linux - go: 1.10.x env: GOTAGS= GOOS=windows GOARCH=amd64 - os: linux go: 1.10.x - env: GOTAGS=libsqlite3 GOOS=windows GOARCH=386 - - os: linux - go: 1.10.x env: GOTAGS=libsqlite3 GOOS=windows GOARCH=amd64 - os: linux go: 1.10.x - 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 - - os: linux - go: 1.10.x - 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 - - os: linux - go: 1.10.x - env: GOTAGS=sqlite_trace GOOS=windows GOARCH=386 - - os: linux - go: 1.10.x - env: GOTAGS=sqlite_trace GOOS=windows GOARCH=amd64 - - os: linux - go: 1.10.x - env: GOTAGS=sqlite_vacuum_full GOOS=windows GOARCH=386 + 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 - os: linux go: 1.10.x env: GOTAGS=sqlite_vacuum_full GOOS=windows GOARCH=amd64 - os: linux go: 1.10.x - env: GOTAGS=sqlite_vacuum_incr GOOS=windows GOARCH=386 - - os: linux - go: 1.10.x env: GOTAGS=sqlite_vacuum_incr GOOS=windows GOARCH=amd64 - os: linux go: 1.10.x - env: GOTAGS=sqlite_vtable GOOS=windows GOARCH=386 - - os: linux - go: 1.10.x env: GOTAGS=sqlite_vtable GOOS=windows GOARCH=amd64 @@ -157,7 +84,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" |