summaryrefslogtreecommitdiff
path: root/packages/database
diff options
context:
space:
mode:
authorAbdoulaye Walsimou Gaye <awg@embtoolkit.org>2011-01-15 19:39:15 +0100
committerAbdoulaye Walsimou Gaye <awg@embtoolkit.org>2011-01-15 19:39:15 +0100
commit13f71b065212fa92fcce52d5425a44dc72b2874c (patch)
tree710ed9c4b81e88661dc766408178bf43e045ae90 /packages/database
parent741d6cfff600294e581b09da6840ae77d21a695a (diff)
downloadembtoolkit-13f71b065212fa92fcce52d5425a44dc72b2874c.tar.gz
embtoolkit-13f71b065212fa92fcce52d5425a44dc72b2874c.tar.bz2
embtoolkit-13f71b065212fa92fcce52d5425a44dc72b2874c.tar.xz
Packages: sqlite: add sqlite-3.7.4
Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
Diffstat (limited to 'packages/database')
-rw-r--r--packages/database/sqlite/sqlite.kconfig10
-rw-r--r--packages/database/sqlite/sqlite.mk10
2 files changed, 16 insertions, 4 deletions
diff --git a/packages/database/sqlite/sqlite.kconfig b/packages/database/sqlite/sqlite.kconfig
index 9c3b50d..e4ee65e 100644
--- a/packages/database/sqlite/sqlite.kconfig
+++ b/packages/database/sqlite/sqlite.kconfig
@@ -25,22 +25,24 @@
config EMBTK_HAVE_SQLITE
bool "Have sqlite"
+ select EMBTK_SQLITE_PKG_IS_TARGZ
help
sqlite description
choice
prompt "sqlite version you wish"
depends on EMBTK_HAVE_SQLITE
help
- Here you can choose which version of sqlite you want to use.
-
+ Here you can choose which version of sqlite you want to use.
+ config EMBTK_SQLITE_VERSION_3_7_4
+ bool "sqlite-3.7.4"
config EMBTK_SQLITE_VERSION_3_7_3
bool "sqlite-3.7.3"
- select EMBTK_SQLITE_PKG_IS_TARGZ
endchoice
config EMBTK_SQLITE_VERSION_STRING
string
- default "3.7.3" if EMBTK_SQLITE_VERSION_3_7_3
+ default "3.7.3" if EMBTK_SQLITE_VERSION_3_7_3
+ default "3070400" if EMBTK_SQLITE_VERSION_3_7_4
config EMBTK_SQLITE_NEED_PATCH
bool
diff --git a/packages/database/sqlite/sqlite.mk b/packages/database/sqlite/sqlite.mk
index 01a9799..bf4fc5e 100644
--- a/packages/database/sqlite/sqlite.mk
+++ b/packages/database/sqlite/sqlite.mk
@@ -28,9 +28,19 @@ SQLITE_VERSION := $(call EMBTK_GET_PKG_VERSION,SQLITE)
SQLITE_SITE := http://www.sqlite.org
SQLITE_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
SQLITE_PATCH_SITE := ftp://ftp.embtoolkit.org/embtoolkit.org/sqlite/$(SQLITE_VERSION)
+# Please sqlite people stop changing the way packages are named and packaged
+ifeq ($(CONFIG_EMBTK_SQLITE_VERSION_3_7_3),y)
SQLITE_PACKAGE := sqlite-amalgamation-$(SQLITE_VERSION).tar.gz
+else
+SQLITE_PACKAGE := sqlite-autoconf-$(SQLITE_VERSION).tar.gz
+endif
+ifeq ($(CONFIG_EMBTK_SQLITE_VERSION_3_7_3),y)
SQLITE_SRC_DIR := $(PACKAGES_BUILD)/sqlite-$(SQLITE_VERSION)
SQLITE_BUILD_DIR := $(PACKAGES_BUILD)/sqlite-$(SQLITE_VERSION)
+else
+SQLITE_SRC_DIR := $(PACKAGES_BUILD)/sqlite-autoconf-$(SQLITE_VERSION)
+SQLITE_BUILD_DIR := $(PACKAGES_BUILD)/sqlite-autoconf-$(SQLITE_VERSION)
+endif
SQLITE_BINS = sqlite3
SQLITE_SBINS =