diff options
Diffstat (limited to 'dev-db/sqlite/files')
-rw-r--r-- | dev-db/sqlite/files/sqlite-3.21.0-full_archive-build.patch (renamed from dev-db/sqlite/files/sqlite-3.16.0-full_tarball-build.patch) | 76 | ||||
-rw-r--r-- | dev-db/sqlite/files/sqlite-3.21.0-nonfull_archive-build.patch | 14 |
2 files changed, 55 insertions, 35 deletions
diff --git a/dev-db/sqlite/files/sqlite-3.16.0-full_tarball-build.patch b/dev-db/sqlite/files/sqlite-3.21.0-full_archive-build.patch index 60907e795f92..dfc01c88b56c 100644 --- a/dev-db/sqlite/files/sqlite-3.16.0-full_tarball-build.patch +++ b/dev-db/sqlite/files/sqlite-3.21.0-full_archive-build.patch @@ -2,17 +2,9 @@ Link executables against libsqlite3.so. Increase timeout for fuzzcheck. Fix building with dlopen() not available. ---- Makefile.in -+++ Makefile.in -@@ -562,6 +562,7 @@ - # - SHELL_OPT = -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_FTS4 - # SHELL_OPT += -DSQLITE_ENABLE_FTS5 -+SHELL_OPT += -DSQLITE_ENABLE_DBSTAT_VTAB - SHELL_OPT += -DSQLITE_ENABLE_EXPLAIN_COMMENTS - SHELL_OPT += -DSQLITE_ENABLE_UNKNOWN_SQL_FUNCTION - FUZZERSHELL_OPT = -DSQLITE_ENABLE_JSON1 -@@ -586,25 +587,25 @@ +--- /Makefile.in ++++ /Makefile.in +@@ -600,25 +600,25 @@ libtclsqlite3.la: tclsqlite.lo libsqlite3.la $(LTLINK) -no-undefined -o $@ tclsqlite.lo \ @@ -22,13 +14,13 @@ Fix building with dlopen() not available. -version-info "8:6:8" \ -avoid-version --sqlite3$(TEXE): $(TOP)/src/shell.c sqlite3.c +-sqlite3$(TEXE): shell.c sqlite3.c - $(LTLINK) $(READLINE_FLAGS) $(SHELL_OPT) -o $@ \ -- $(TOP)/src/shell.c sqlite3.c \ +- shell.c sqlite3.c \ - $(LIBREADLINE) $(TLIBS) -rpath "$(libdir)" -+sqlite3$(TEXE): $(TOP)/src/shell.c libsqlite3.la ++sqlite3$(TEXE): shell.c libsqlite3.la + $(LTLINK) $(READLINE_FLAGS) -o $@ \ -+ $(TOP)/src/shell.c libsqlite3.la \ ++ shell.c libsqlite3.la \ + $(LIBREADLINE) -sqldiff$(TEXE): $(TOP)/tool/sqldiff.c sqlite3.lo sqlite3.h @@ -49,7 +41,7 @@ Fix building with dlopen() not available. srcck1$(BEXE): $(TOP)/tool/srcck1.c $(BCC) -o srcck1$(BEXE) $(TOP)/tool/srcck1.c -@@ -679,7 +680,7 @@ +@@ -694,7 +694,7 @@ # Rule to build the amalgamation # sqlite3.lo: sqlite3.c @@ -58,7 +50,7 @@ Fix building with dlopen() not available. # Rules to build the LEMON compiler generator # -@@ -1105,13 +1106,13 @@ +@@ -1145,13 +1145,13 @@ # Fuzz testing fuzztest: fuzzcheck$(TEXE) $(FUZZDATA) @@ -75,26 +67,25 @@ Fix building with dlopen() not available. # The veryquick.test TCL tests. # -@@ -1141,32 +1142,31 @@ +@@ -1181,30 +1181,30 @@ smoketest: $(TESTPROGS) fuzzcheck$(TEXE) ./testfixture$(TEXE) $(TOP)/test/main.test $(TESTOPTS) --sqlite3_analyzer.c: sqlite3.c $(TOP)/src/tclsqlite.c $(TOP)/tool/spaceanal.tcl -+sqlite3_analyzer.c: $(TOP)/src/tclsqlite.c $(TOP)/tool/spaceanal.tcl - echo "#define TCLSH 2" > $@ -- echo "#define SQLITE_ENABLE_DBSTAT_VTAB 1" >> $@ -- cat sqlite3.c $(TOP)/src/tclsqlite.c >> $@ -+ cat $(TOP)/src/tclsqlite.c >> $@ - echo "static const char *tclsh_main_loop(void){" >> $@ - echo "static const char *zMainloop = " >> $@ - $(TCLSH_CMD) $(TOP)/tool/tostr.tcl $(TOP)/tool/spaceanal.tcl >> $@ - echo "; return zMainloop; }" >> $@ +-sqlite3_analyzer.c: sqlite3.c $(TOP)/src/tclsqlite.c $(TOP)/tool/spaceanal.tcl $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqlite3_analyzer.c.in ++sqlite3_analyzer.c: $(TOP)/src/tclsqlite.c $(TOP)/tool/spaceanal.tcl $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqlite3_analyzer.c.in + $(TCLSH_CMD) $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqlite3_analyzer.c.in >sqlite3_analyzer.c -sqlite3_analyzer$(TEXE): sqlite3_analyzer.c - $(LTLINK) sqlite3_analyzer.c -o $@ $(LIBTCL) $(TLIBS) +sqlite3_analyzer$(TEXE): sqlite3_analyzer.c libsqlite3.la + $(LTLINK) sqlite3_analyzer.c -o $@ libsqlite3.la $(LIBTCL) +-dbdump$(TEXE): $(TOP)/ext/misc/dbdump.c sqlite3.lo ++dbdump$(TEXE): $(TOP)/ext/misc/dbdump.c libsqlite3.la + $(LTLINK) -DDBDUMP_STANDALONE -o $@ \ +- $(TOP)/ext/misc/dbdump.c sqlite3.lo $(TLIBS) ++ $(TOP)/ext/misc/dbdump.c libsqlite3.la + -showdb$(TEXE): $(TOP)/tool/showdb.c sqlite3.lo - $(LTLINK) -o $@ $(TOP)/tool/showdb.c sqlite3.lo $(TLIBS) +showdb$(TEXE): $(TOP)/tool/showdb.c libsqlite3.la @@ -122,19 +113,24 @@ Fix building with dlopen() not available. rollback-test$(TEXE): $(TOP)/tool/rollback-test.c sqlite3.lo $(LTLINK) -o $@ $(TOP)/tool/rollback-test.c sqlite3.lo $(TLIBS) -@@ -1180,8 +1180,8 @@ - speedtest1$(TEXE): $(TOP)/test/speedtest1.c sqlite3.lo - $(LTLINK) -o $@ $(TOP)/test/speedtest1.c sqlite3.lo $(TLIBS) +@@ -1223,11 +1223,11 @@ + kvtest$(TEXE): $(TOP)/test/kvtest.c sqlite3.c + $(LTLINK) $(KV_OPT) -o $@ $(TOP)/test/kvtest.c sqlite3.c $(TLIBS) -rbu$(EXE): $(TOP)/ext/rbu/rbu.c $(TOP)/ext/rbu/sqlite3rbu.c sqlite3.lo - $(LTLINK) -I. -o $@ $(TOP)/ext/rbu/rbu.c sqlite3.lo $(TLIBS) +rbu$(EXE): $(TOP)/ext/rbu/rbu.c libsqlite3.la + $(LTLINK) -I. -o $@ $(TOP)/ext/rbu/rbu.c libsqlite3.la - loadfts$(EXE): $(TOP)/tool/loadfts.c libsqlite3.la - $(LTLINK) $(TOP)/tool/loadfts.c libsqlite3.la -o $@ $(TLIBS) ---- configure.ac -+++ configure.ac +-loadfts$(EXE): $(TOP)/tool/loadfts.c libsqlite3.la +- $(LTLINK) $(TOP)/tool/loadfts.c libsqlite3.la -o $@ $(TLIBS) ++loadfts$(EXE): $(TOP)/tool/loadfts.c libsqlite3.la ++ $(LTLINK) $(TOP)/tool/loadfts.c libsqlite3.la -o $@ + + # This target will fail if the SQLite amalgamation contains any exported + # symbols that do not begin with "sqlite3_". It is run as part of the +--- /configure.ac ++++ /configure.ac @@ -584,6 +584,9 @@ if test "${use_loadextension}" = "yes" ; then OPT_FEATURE_FLAGS="" @@ -145,3 +141,13 @@ Fix building with dlopen() not available. else OPT_FEATURE_FLAGS="-DSQLITE_OMIT_LOAD_EXTENSION=1" fi +--- /tool/sqlite3_analyzer.c.in ++++ /tool/sqlite3_analyzer.c.in +@@ -14,7 +14,6 @@ + #define SQLITE_DEFAULT_MEMSTATUS 0 + #define SQLITE_MAX_EXPR_DEPTH 0 + #define SQLITE_OMIT_LOAD_EXTENSION 1 +-INCLUDE sqlite3.c + INCLUDE $ROOT/src/tclsqlite.c + + const char *sqlite3_analyzer_init_proc(Tcl_Interp *interp){ diff --git a/dev-db/sqlite/files/sqlite-3.21.0-nonfull_archive-build.patch b/dev-db/sqlite/files/sqlite-3.21.0-nonfull_archive-build.patch new file mode 100644 index 000000000000..06ea8b290536 --- /dev/null +++ b/dev-db/sqlite/files/sqlite-3.21.0-nonfull_archive-build.patch @@ -0,0 +1,14 @@ +Fix building with dlopen() not available. + +--- /configure.ac ++++ /configure.ac +@@ -102,6 +102,9 @@ + [], [enable_dynamic_extensions=yes]) + if test x"$enable_dynamic_extensions" != "xno"; then + AC_SEARCH_LIBS(dlopen, dl) ++ if test "${ac_cv_search_dlopen}" = "no" ; then ++ DYNAMIC_EXTENSION_FLAGS=-DSQLITE_OMIT_LOAD_EXTENSION=1 ++ fi + else + DYNAMIC_EXTENSION_FLAGS=-DSQLITE_OMIT_LOAD_EXTENSION=1 + fi |