diff --git a/packages/databases/sqlite/build b/packages/databases/sqlite/build index 54cdae74fe..7a26a6030d 100755 --- a/packages/databases/sqlite/build +++ b/packages/databases/sqlite/build @@ -19,10 +19,8 @@ cd $BUILD/$1* --sysconfdir=/etc \ --disable-static \ --enable-shared \ - --disable-tcl \ --disable-readline \ --enable-threadsafe \ - --enable-load-extension \ make diff --git a/packages/databases/sqlite/patches/20_libtool.diff b/packages/databases/sqlite/patches/20_libtool.diff deleted file mode 100644 index 0e442ae0a6..0000000000 --- a/packages/databases/sqlite/patches/20_libtool.diff +++ /dev/null @@ -1,24 +0,0 @@ -diff -Naur sqlite-3.6.11.orig/Makefile.in sqlite-3.6.11/Makefile.in ---- sqlite-3.6.11.orig/Makefile.in 2009-03-15 14:58:48.000000000 +0100 -+++ sqlite-3.6.11/Makefile.in 2009-03-15 15:01:15.000000000 +0100 -@@ -15,7 +15,10 @@ - # The toplevel directory of the source tree. This is the directory - # that contains this "Makefile.in" and the "configure.in" script. - # --TOP = @srcdir@ -+TOP = $(srcdir) -+srcdir = @srcdir@ -+top_srcdir = @top_srcdir@ -+top_builddir = . - - # C Compiler and options for use in building executables that - # will run on the platform that is doing the build. -@@ -147,7 +150,7 @@ - bindir = @bindir@ - includedir = @includedir@ - INSTALL = @INSTALL@ --LIBTOOL = ./libtool -+LIBTOOL = @LIBTOOL@ - ALLOWRELEASE = @ALLOWRELEASE@ - - # libtool compile/link/install diff --git a/packages/databases/sqlite/patches/30_ldflags.diff b/packages/databases/sqlite/patches/30_ldflags.diff index 38f16579f7..65a2389564 100644 --- a/packages/databases/sqlite/patches/30_ldflags.diff +++ b/packages/databases/sqlite/patches/30_ldflags.diff @@ -1,61 +1,33 @@ -diff -Naur sqlite-3.6.13.orig/Makefile.in sqlite-3.6.13/Makefile.in ---- sqlite-3.6.13.orig/Makefile.in.orig 2009-04-17 09:11:59.000000000 +0200 -+++ sqlite-3.6.13/Makefile.in 2009-04-17 09:11:59.000000000 +0200 -@@ -36,6 +36,10 @@ - # - TCC += -D_HAVE_SQLITE_CONFIG_H - +diff -Naur sqlite-3.6.13/Makefile.in sqlite-3.6.13.patch/Makefile.in +--- sqlite-3.6.13/Makefile.in 2009-04-13 10:57:54.000000000 +0200 ++++ sqlite-3.6.13.patch/Makefile.in 2009-04-19 18:49:22.036813333 +0200 +@@ -158,6 +158,11 @@ + STRIP = @STRIP@ + THREADSAFE_FLAGS = @THREADSAFE_FLAGS@ + VERSION = @VERSION@ ++ +# OE overrides +# +TARGET_LFLAGS = $(config_TARGET_LFLAGS) + - # Define -DNDEBUG to compile without debugging (i.e., for production usage) - # Omitting the define will cause extra debugging code to be inserted and - # includes extra comments when "EXPLAIN stmt" is used. -@@ -465,18 +469,18 @@ - | $(NAWK) '{print $$5,$$6}' >last_change + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +@@ -283,7 +288,7 @@ + rm -f "$${dir}/so_locations"; \ + done + libsqlite3.la: $(libsqlite3_la_OBJECTS) $(libsqlite3_la_DEPENDENCIES) +- $(LINK) -rpath $(libdir) $(libsqlite3_la_LDFLAGS) $(libsqlite3_la_OBJECTS) $(libsqlite3_la_LIBADD) $(LIBS) ++ $(LINK) -rpath $(libdir) $(libsqlite3_la_LDFLAGS) $(libsqlite3_la_OBJECTS) $(libsqlite3_la_LIBADD) $(TARGET_LFLAGS) $(LIBS) + install-binPROGRAMS: $(bin_PROGRAMS) + @$(NORMAL_INSTALL) + test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)" +@@ -314,7 +319,7 @@ + done + sqlite3$(EXEEXT): $(sqlite3_OBJECTS) $(sqlite3_DEPENDENCIES) + @rm -f sqlite3$(EXEEXT) +- $(LINK) $(sqlite3_LDFLAGS) $(sqlite3_OBJECTS) $(sqlite3_LDADD) $(LIBS) ++ $(LINK) $(sqlite3_LDFLAGS) $(sqlite3_OBJECTS) $(sqlite3_LDADD) $(TARGET_LFLAGS) $(LIBS) - libsqlite3.la: $(LIBOBJ) -- $(LTLINK) -o $@ $(LIBOBJ) $(TLIBS) \ -+ $(LTLINK) -o $@ $(LIBOBJ) $(TARGET_LFLAGS) $(TLIBS) \ - ${ALLOWRELEASE} -rpath "$(libdir)" -version-info "8:6:8" - - libtclsqlite3.la: tclsqlite.lo libsqlite3.la - $(LTLINK) -o $@ tclsqlite.lo \ -- libsqlite3.la @TCL_STUB_LIB_SPEC@ $(TLIBS) \ -+ libsqlite3.la @TCL_STUB_LIB_SPEC@ $(TARGET_LFLAGS) $(TLIBS) \ - -rpath "$(TCLLIBDIR)" \ - -version-info "8:6:8" \ - -avoid-version - - sqlite3$(TEXE): $(TOP)/src/shell.c libsqlite3.la sqlite3.h -- $(LTLINK) $(READLINE_FLAGS) \ -+ $(LTLINK) $(READLINE_FLAGS) $(TARGET_LFLAGS) \ - -o $@ $(TOP)/src/shell.c libsqlite3.la \ - $(LIBREADLINE) $(TLIBS) -rpath "$(libdir)" - -@@ -747,13 +751,13 @@ - - tclsqlite3$(TEXE): tclsqlite-shell.lo libsqlite3.la - $(LTLINK) -o $@ tclsqlite-shell.lo \ -- libsqlite3.la $(LIBTCL) -+ libsqlite3.la $(TARGET_LFLAGS) $(LIBTCL) - - testfixture$(TEXE): $(TESTFIXTURE_SRC) - $(LTLINK) -DTCLSH=1 -DSQLITE_TEST=1 -DSQLITE_NO_SYNC=1\ - -DSQLITE_CRASH_TEST=1 \ - -DSQLITE_SERVER=1 -DSQLITE_PRIVATE="" -DSQLITE_CORE $(TEMP_STORE) \ -- -o $@ $(TESTFIXTURE_SRC) $(LIBTCL) $(TLIBS) -+ -o $@ $(TESTFIXTURE_SRC) $(TARGET_LFLAGS) $(LIBTCL) $(TLIBS) - - - fulltest: testfixture$(TEXE) sqlite3$(TEXE) -@@ -772,7 +776,7 @@ - $(TOP)/tool/spaceanal.tcl >spaceanal_tcl.h - $(LTLINK) -DTCLSH=2 -DSQLITE_TEST=1 -DSQLITE_CRASH_TEST=1 \ - -DSQLITE_SERVER=1 -DSQLITE_PRIVATE="" -DSQLITE_CORE \ -- $(TEMP_STORE) -o $@ $(TESTFIXTURE_SRC) $(LIBTCL) -+ $(TEMP_STORE) -o $@ $(TESTFIXTURE_SRC) $(TARGET_LFLAGS) $(LIBTCL) - - - lib_install: libsqlite3.la + mostlyclean-compile: + -rm -f *.$(OBJEXT) diff --git a/packages/databases/sqlite/url b/packages/databases/sqlite/url index 930273cd02..afd9a96aec 100644 --- a/packages/databases/sqlite/url +++ b/packages/databases/sqlite/url @@ -1 +1 @@ -http://www.hwaci.com/sw/sqlite/sqlite-3.6.13.tar.gz +http://www.hwaci.com/sw/sqlite/sqlite-amalgamation-3.6.13.tar.gz