From f6e7921d24a633f15e039189b0c06889f0c5e4a5 Mon Sep 17 00:00:00 2001 From: Christian Brauner Date: Mon, 17 Oct 2016 14:28:16 +0200 Subject: [PATCH 1/2] actually link to when -tags libsqlite3 Building with -tags libsqlite3 used the sqlite3.h from the system but the go compiler will compile all *.{c,h} files in the same direcory: "When the Go tool sees that one or more Go files use the special import "C", it will look for other non-Go files in the directory and compile them as part of the Go package. Any .c, .s, or .S files will be compiled with the C compiler." (https://golang.org/cmd/cgo/) So if users actually want to link against the system sqlite3 we should make sqlite3-binding.* a noop. Signed-off-by: Christian Brauner --- sqlite3-binding.c | 5 +++++ sqlite3-binding.h | 5 +++++ sqlite3ext.h | 11 ++++++++--- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/sqlite3-binding.c b/sqlite3-binding.c index 1f085b0..a8790de 100644 --- a/sqlite3-binding.c +++ b/sqlite3-binding.c @@ -17,6 +17,7 @@ ** language. The code for the "sqlite3" command-line shell is also in a ** separate file. This file contains only code for the core SQLite library. */ +#ifndef USE_LIBSQLITE3 #define SQLITE_CORE 1 #define SQLITE_AMALGAMATION 1 #ifndef SQLITE_PRIVATE @@ -197846,5 +197847,9 @@ static int sqlite3Fts5VocabInit(Fts5Global *pGlobal, sqlite3 *db){ #endif /* !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_FTS5) */ +#else // USE_LIBSQLITE3 +// If users really want to link against the system sqlite3 we +// need to make this file a noop. +#endif /************** End of fts5.c ************************************************/ diff --git a/sqlite3-binding.h b/sqlite3-binding.h index 4e2df5e..430ffee 100644 --- a/sqlite3-binding.h +++ b/sqlite3-binding.h @@ -30,6 +30,7 @@ ** the version number) and changes its name to "sqlite3.h" as ** part of the build process. */ +#ifndef USE_LIBSQLITE3 #ifndef SQLITE3_H #define SQLITE3_H #include /* Needed for the definition of va_list */ @@ -10338,5 +10339,9 @@ struct fts5_api { #endif #endif /* _FTS5_H */ +#else // USE_LIBSQLITE3 +// If users really want to link against the system sqlite3 we +// need to make this file a noop. +#endif /******** End of fts5.h *********/ diff --git a/sqlite3ext.h b/sqlite3ext.h index ce87e74..0c28610 100644 --- a/sqlite3ext.h +++ b/sqlite3ext.h @@ -1,3 +1,4 @@ +#ifndef USE_LIBSQLITE3 /* ** 2006 June 7 ** @@ -12,7 +13,7 @@ ** This header file defines the SQLite interface for use by ** shared libraries that want to be imported as extensions into ** an SQLite instance. Shared libraries that intend to be loaded -** as extensions by SQLite should #include this file instead of +** as extensions by SQLite should #include this file instead of ** sqlite3.h. */ #ifndef SQLITE3EXT_H @@ -543,14 +544,14 @@ typedef int (*sqlite3_loadext_entry)( #endif /* !defined(SQLITE_CORE) && !defined(SQLITE_OMIT_LOAD_EXTENSION) */ #if !defined(SQLITE_CORE) && !defined(SQLITE_OMIT_LOAD_EXTENSION) - /* This case when the file really is being compiled as a loadable + /* This case when the file really is being compiled as a loadable ** extension */ # define SQLITE_EXTENSION_INIT1 const sqlite3_api_routines *sqlite3_api=0; # define SQLITE_EXTENSION_INIT2(v) sqlite3_api=v; # define SQLITE_EXTENSION_INIT3 \ extern const sqlite3_api_routines *sqlite3_api; #else - /* This case when the file is being statically linked into the + /* This case when the file is being statically linked into the ** application */ # define SQLITE_EXTENSION_INIT1 /*no-op*/ # define SQLITE_EXTENSION_INIT2(v) (void)v; /* unused parameter */ @@ -558,3 +559,7 @@ typedef int (*sqlite3_loadext_entry)( #endif #endif /* SQLITE3EXT_H */ +#else // USE_LIBSQLITE3 + // If users really want to link against the system sqlite3 we +// need to make this file a noop. + #endif From 420dc664edf0a720aa2edb4d7b25e833c1e7ed2a Mon Sep 17 00:00:00 2001 From: Christian Brauner Date: Fri, 28 Oct 2016 10:11:52 +0200 Subject: [PATCH 2/2] upgrade: add ifdefines This makes it possible to correctly link against the system sqlite. Also, don't use defers with log.Fatal() since they won't be run on exit. Signed-off-by: Christian Brauner --- tool/upgrade.go | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/tool/upgrade.go b/tool/upgrade.go index 4e99635..baadd0f 100644 --- a/tool/upgrade.go +++ b/tool/upgrade.go @@ -37,18 +37,21 @@ func main() { if err != nil { log.Fatal(err) } - defer resp.Body.Close() b, err := ioutil.ReadAll(resp.Body) if err != nil { + resp.Body.Close() log.Fatal(err) } fmt.Printf("extracting %v\n", path.Base(url)) r, err := zip.NewReader(bytes.NewReader(b), resp.ContentLength) if err != nil { + resp.Body.Close() log.Fatal(err) } + resp.Body.Close() + for _, zf := range r.File { var f *os.File switch path.Base(zf.Name) { @@ -68,11 +71,27 @@ func main() { if err != nil { log.Fatal(err) } - _, err = io.Copy(f, zr) - f.Close() + + _, err = io.WriteString(f, "#ifndef USE_LIBSQLITE3\n") if err != nil { + zr.Close() + f.Close() log.Fatal(err) } + _, err = io.Copy(f, zr) + if err != nil { + zr.Close() + f.Close() + log.Fatal(err) + } + _, err = io.WriteString(f, "#else // USE_LIBSQLITE3\n // If users really want to link against the system sqlite3 we\n// need to make this file a noop.\n #endif") + if err != nil { + zr.Close() + f.Close() + log.Fatal(err) + } + zr.Close() + f.Close() fmt.Printf("extracted %v\n", filepath.Base(f.Name())) } }