* [Buildroot] svn commit: trunk/buildroot/package/database/sqlite
@ 2008-07-17 13:20 jacmet at uclibc.org
0 siblings, 0 replies; 6+ messages in thread
From: jacmet at uclibc.org @ 2008-07-17 13:20 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-07-17 06:20:23 -0700 (Thu, 17 Jul 2008)
New Revision: 22862
Log:
sqlite: fix target install and clean
- install -D isn't a good idea for symlinks as it replaces them with the
target files, leading to 3 copies of libsqlite.
- clean was missing include and pkgconfig files
Modified:
trunk/buildroot/package/database/sqlite/sqlite.mk
Changeset:
Modified: trunk/buildroot/package/database/sqlite/sqlite.mk
===================================================================
--- trunk/buildroot/package/database/sqlite/sqlite.mk 2008-07-17 13:20:05 UTC (rev 22861)
+++ trunk/buildroot/package/database/sqlite/sqlite.mk 2008-07-17 13:20:23 UTC (rev 22862)
@@ -52,8 +52,8 @@
$(TARGET_DIR)/usr/bin/sqlite3: $(STAGING_DIR)/usr/bin/sqlite3
$(INSTALL) -m 0755 -D $^ $@
$(STRIPCMD) $(STRIP_STRIP_ALL) $@
- $(INSTALL) -m 0644 -D $(STAGING_DIR)/usr/lib/libsqlite3*.so* $(TARGET_DIR)/usr/lib/
- $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libsqlite3.so*
+ cp -dpf $(STAGING_DIR)/usr/lib/libsqlite3*.so* $(TARGET_DIR)/usr/lib/
+ $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libsqlite3.so
sqlite: uclibc readline-target ncurses $(TARGET_DIR)/usr/bin/sqlite3
@@ -63,6 +63,8 @@
-$(MAKE) -C $(SQLITE_DIR) clean
-rm -rf $(STAGING_DIR)/usr/lib/libsqlite*
-rm -rf $(STAGING_DIR)/usr/bin/sqlite3
+ -rm -rf $(STAGING_DIR)/usr/include/sqlite*
+ -rm -rf $(STAGING_DIR)/usr/lib/pkgconfig/sqlite*
-rm -rf $(TARGET_DIR)/usr/lib/libsqlite*
-rm -rf $(TARGET_DIR)/usr/bin/sqlite3
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/database/sqlite
@ 2008-08-21 14:51 jacmet at uclibc.org
0 siblings, 0 replies; 6+ messages in thread
From: jacmet at uclibc.org @ 2008-08-21 14:51 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-08-21 07:51:14 -0700 (Thu, 21 Aug 2008)
New Revision: 23162
Log:
sqlite: bump version
Modified:
trunk/buildroot/package/database/sqlite/sqlite.mk
Changeset:
Modified: trunk/buildroot/package/database/sqlite/sqlite.mk
===================================================================
--- trunk/buildroot/package/database/sqlite/sqlite.mk 2008-08-21 14:37:14 UTC (rev 23161)
+++ trunk/buildroot/package/database/sqlite/sqlite.mk 2008-08-21 14:51:14 UTC (rev 23162)
@@ -4,7 +4,7 @@
#
#############################################################
-SQLITE_VERSION:=3.5.9
+SQLITE_VERSION:=3.6.1
SQLITE_SOURCE:=sqlite-$(SQLITE_VERSION).tar.gz
SQLITE_SITE:=http://www.sqlite.org
SQLITE_DIR:=$(BUILD_DIR)/sqlite-$(SQLITE_VERSION)
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/database/sqlite
@ 2008-09-05 10:37 jacmet at uclibc.org
0 siblings, 0 replies; 6+ messages in thread
From: jacmet at uclibc.org @ 2008-09-05 10:37 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-09-05 03:37:28 -0700 (Fri, 05 Sep 2008)
New Revision: 23327
Log:
sqlite: bump version
Modified:
trunk/buildroot/package/database/sqlite/sqlite.mk
Changeset:
Modified: trunk/buildroot/package/database/sqlite/sqlite.mk
===================================================================
--- trunk/buildroot/package/database/sqlite/sqlite.mk 2008-09-05 04:59:02 UTC (rev 23326)
+++ trunk/buildroot/package/database/sqlite/sqlite.mk 2008-09-05 10:37:28 UTC (rev 23327)
@@ -4,7 +4,7 @@
#
#############################################################
-SQLITE_VERSION:=3.6.1
+SQLITE_VERSION:=3.6.2
SQLITE_SOURCE:=sqlite-$(SQLITE_VERSION).tar.gz
SQLITE_SITE:=http://www.sqlite.org
SQLITE_DIR:=$(BUILD_DIR)/sqlite-$(SQLITE_VERSION)
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/database/sqlite
@ 2008-10-21 8:56 jacmet at uclibc.org
0 siblings, 0 replies; 6+ messages in thread
From: jacmet at uclibc.org @ 2008-10-21 8:56 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-10-21 01:56:15 -0700 (Tue, 21 Oct 2008)
New Revision: 23749
Log:
sqlite: bump version
Modified:
trunk/buildroot/package/database/sqlite/sqlite.mk
Changeset:
Modified: trunk/buildroot/package/database/sqlite/sqlite.mk
===================================================================
--- trunk/buildroot/package/database/sqlite/sqlite.mk 2008-10-20 21:29:27 UTC (rev 23748)
+++ trunk/buildroot/package/database/sqlite/sqlite.mk 2008-10-21 08:56:15 UTC (rev 23749)
@@ -4,7 +4,7 @@
#
#############################################################
-SQLITE_VERSION:=3.6.2
+SQLITE_VERSION:=3.6.4
SQLITE_SOURCE:=sqlite-$(SQLITE_VERSION).tar.gz
SQLITE_SITE:=http://www.sqlite.org
SQLITE_DIR:=$(BUILD_DIR)/sqlite-$(SQLITE_VERSION)
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/database/sqlite
@ 2009-01-29 19:49 jacmet at uclibc.org
0 siblings, 0 replies; 6+ messages in thread
From: jacmet at uclibc.org @ 2009-01-29 19:49 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2009-01-29 19:49:22 +0000 (Thu, 29 Jan 2009)
New Revision: 25135
Log:
sqlite: bump version
Fixes several database corruption bugs
Modified:
trunk/buildroot/package/database/sqlite/sqlite.mk
Changeset:
Modified: trunk/buildroot/package/database/sqlite/sqlite.mk
===================================================================
--- trunk/buildroot/package/database/sqlite/sqlite.mk 2009-01-29 19:25:24 UTC (rev 25134)
+++ trunk/buildroot/package/database/sqlite/sqlite.mk 2009-01-29 19:49:22 UTC (rev 25135)
@@ -4,7 +4,7 @@
#
#############################################################
-SQLITE_VERSION:=3.6.4
+SQLITE_VERSION:=3.6.10
SQLITE_SOURCE:=sqlite-$(SQLITE_VERSION).tar.gz
SQLITE_SITE:=http://www.sqlite.org
SQLITE_DIR:=$(BUILD_DIR)/sqlite-$(SQLITE_VERSION)
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/database/sqlite
@ 2009-03-03 20:23 jacmet at uclibc.org
0 siblings, 0 replies; 6+ messages in thread
From: jacmet at uclibc.org @ 2009-03-03 20:23 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2009-03-03 20:23:18 +0000 (Tue, 03 Mar 2009)
New Revision: 25511
Log:
sqlite: bump version and convert to Makefile.autotools.in format
Patch by Gustavo Zacarias <gustavo@zacarias.com.ar>
Closes #139.
Modified:
trunk/buildroot/package/database/sqlite/Config.in
trunk/buildroot/package/database/sqlite/sqlite.mk
Changeset:
Modified: trunk/buildroot/package/database/sqlite/Config.in
===================================================================
--- trunk/buildroot/package/database/sqlite/Config.in 2009-03-03 20:23:10 UTC (rev 25510)
+++ trunk/buildroot/package/database/sqlite/Config.in 2009-03-03 20:23:18 UTC (rev 25511)
@@ -1,9 +1,16 @@
config BR2_PACKAGE_SQLITE
bool "sqlite"
- select BR2_PACKAGE_NCURSES
- select BR2_PACKAGE_READLINE
help
SQLite is a small C library that implements a self-contained,
embeddable, zero-configuration SQL database engine.
http://www.sqlite.org/
+
+config BR2_PACKAGE_SQLITE_READLINE
+ bool "Command-line editing"
+ depends on BR2_PACKAGE_SQLITE
+ select BR2_PACKAGE_NCURSES
+ select BR2_PACKAGE_READLINE
+ help
+ Enable command-line editing. This requires ncurses and readline.
+
Modified: trunk/buildroot/package/database/sqlite/sqlite.mk
===================================================================
--- trunk/buildroot/package/database/sqlite/sqlite.mk 2009-03-03 20:23:10 UTC (rev 25510)
+++ trunk/buildroot/package/database/sqlite/sqlite.mk 2009-03-03 20:23:18 UTC (rev 25511)
@@ -4,77 +4,38 @@
#
#############################################################
-SQLITE_VERSION:=3.6.10
-SQLITE_SOURCE:=sqlite-$(SQLITE_VERSION).tar.gz
-SQLITE_SITE:=http://www.sqlite.org
-SQLITE_DIR:=$(BUILD_DIR)/sqlite-$(SQLITE_VERSION)
-SQLITE_CAT:=$(ZCAT)
+SQLITE_VERSION = 3.6.11
+SQLITE_SOURCE = sqlite-$(SQLITE_VERSION).tar.gz
+SQLITE_SITE = http://www.sqlite.org
+SQLITE_INSTALL_STAGING = YES
+SQLITE_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
+SQLITE_LIBTOOL_PATCH = NO
+SQLITE_DEPENDENCIES = uclibc
-$(DL_DIR)/$(SQLITE_SOURCE):
- $(call DOWNLOAD,$(SQLITE_SITE),$(SQLITE_SOURCE))
+SQLITE_CONF_OPT = --enable-shared \
+ --enable-static \
+ --enable-tempstore=yes \
+ --enable-threadsafe \
+ --enable-releasemode \
+ --disable-tcl \
+ --localstatedir=/var
-$(SQLITE_DIR)/.unpacked: $(DL_DIR)/$(SQLITE_SOURCE)
- $(SQLITE_CAT) $(DL_DIR)/$(SQLITE_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- touch $(SQLITE_DIR)/.unpacked
+ifeq ($(BR2_PACKAGE_SQLITE_READLINE),y)
+SQLITE_DEPENDENCIES += ncurses readline
+SQLITE_CONF_OPT += --with-readline-inc="-I$(STAGING_DIR)/usr/include"
+else
+SQLITE_CONF_OPT += --disable-readline
+endif
-$(SQLITE_DIR)/.configured: $(SQLITE_DIR)/.unpacked
- (cd $(SQLITE_DIR); rm -rf config.cache; \
- $(TARGET_CONFIGURE_OPTS) \
- $(TARGET_CONFIGURE_ARGS) \
- config_BUILD_CC="$(HOSTCC)" \
- config_TARGET_CFLAGS="$(TARGET_CFLAGS)" \
- config_TARGET_CC="$(TARGET_CC)" \
- config_TARGET_READLINE_LIBS="-L$(TARGET_DIR)/usr/lib -L$(TARGET_DIR)/lib -lncurses -lreadline" \
- config_TARGET_READLINE_INC="-I$(STAGING_DIR)/usr/include" \
- ./configure \
- --target=$(GNU_TARGET_NAME) \
- --host=$(GNU_TARGET_NAME) \
- --build=$(GNU_HOST_NAME) \
- --prefix=/usr \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --enable-shared \
- --enable-static \
- --disable-tcl \
- --enable-tempstore \
- --enable-threadsafe \
- --enable-releasemode \
- )
- touch $(SQLITE_DIR)/.configured
+$(eval $(call AUTOTARGETS,package,sqlite))
-$(SQLITE_DIR)/sqlite3: $(SQLITE_DIR)/.configured
- $(MAKE) -C $(SQLITE_DIR)
+$(SQLITE_TARGET_UNINSTALL):
+ $(call MESSAGE,"Uninstalling")
+ rm -f $(TARGET_DIR)/usr/bin/sqlite3
+ rm -f $(TARGET_DIR)/usr/lib/libsqlite3*
+ rm -f $(STAGING_DIR)/usr/bin/sqlite3
+ rm -f $(STAGING_DIR)/usr/lib/libsqlite3*
+ rm -f $(STAGING_DIR)/usr/lib/pkgconfig/sqlite3.pc
+ rm -f $(STAGING_DIR)/usr/include/sqlite3*.h
+ rm -f $(SQLITE_TARGET_INSTALL_TARGET) $(SQLITE_HOOK_POST_INSTALL)
-$(STAGING_DIR)/usr/bin/sqlite3: $(SQLITE_DIR)/sqlite3
- $(MAKE) DESTDIR=$(STAGING_DIR) -C $(SQLITE_DIR) install
- $(SED) "s,^libdir=.*,libdir=\'$(STAGING_DIR)/usr/lib\',g" $(STAGING_DIR)/usr/lib/libsqlite3.la
-
-$(TARGET_DIR)/usr/bin/sqlite3: $(STAGING_DIR)/usr/bin/sqlite3
- $(INSTALL) -m 0755 -D $^ $@
- $(STRIPCMD) $(STRIP_STRIP_ALL) $@
- cp -dpf $(STAGING_DIR)/usr/lib/libsqlite3*.so* $(TARGET_DIR)/usr/lib/
- $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libsqlite3.so
-
-sqlite: uclibc ncurses $(TARGET_DIR)/usr/bin/sqlite3
-
-sqlite-source: $(DL_DIR)/$(SQLITE_SOURCE)
-
-sqlite-clean:
- -$(MAKE) -C $(SQLITE_DIR) clean
- -rm -rf $(STAGING_DIR)/usr/lib/libsqlite*
- -rm -rf $(STAGING_DIR)/usr/bin/sqlite3
- -rm -rf $(STAGING_DIR)/usr/include/sqlite*
- -rm -rf $(STAGING_DIR)/usr/lib/pkgconfig/sqlite*
- -rm -rf $(TARGET_DIR)/usr/lib/libsqlite*
- -rm -rf $(TARGET_DIR)/usr/bin/sqlite3
-
-sqlite-dirclean:
- rm -rf $(SQLITE_DIR)
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_SQLITE),y)
-TARGETS+=sqlite
-endif
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2009-03-03 20:23 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-07-17 13:20 [Buildroot] svn commit: trunk/buildroot/package/database/sqlite jacmet at uclibc.org
-- strict thread matches above, loose matches on Subject: below --
2008-08-21 14:51 jacmet at uclibc.org
2008-09-05 10:37 jacmet at uclibc.org
2008-10-21 8:56 jacmet at uclibc.org
2009-01-29 19:49 jacmet at uclibc.org
2009-03-03 20:23 jacmet at uclibc.org
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox