diff options
| author | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2011-07-31 14:19:41 +0200 |
|---|---|---|
| committer | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2011-07-31 14:19:41 +0200 |
| commit | f7bdb3d8ebdb2232655f0e8c7dfdfeb52be19969 (patch) | |
| tree | 8e877ccbcd12998ece510759959d86b2c2fb189c | |
| parent | d8bef8310f3c7f793f2e66ddc1ddf31b4f3a9e09 (diff) | |
| download | embtoolkit-f7bdb3d8ebdb2232655f0e8c7dfdfeb52be19969.tar.gz embtoolkit-f7bdb3d8ebdb2232655f0e8c7dfdfeb52be19969.tar.bz2 embtoolkit-f7bdb3d8ebdb2232655f0e8c7dfdfeb52be19969.tar.xz | |
Packages: SQLite: add sqlite-3.7.7.1
Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
| -rw-r--r-- | packages/database/sqlite/sqlite.kconfig | 6 | ||||
| -rw-r--r-- | packages/database/sqlite/sqlite.mk | 54 |
2 files changed, 29 insertions, 31 deletions
diff --git a/packages/database/sqlite/sqlite.kconfig b/packages/database/sqlite/sqlite.kconfig index eb29785..d2f9f61 100644 --- a/packages/database/sqlite/sqlite.kconfig +++ b/packages/database/sqlite/sqlite.kconfig @@ -33,6 +33,9 @@ choice depends on EMBTK_HAVE_SQLITE help Here you can choose which version of sqlite you want to use. + + config EMBTK_SQLITE_VERSION_3_7_7_1 + bool "sqlite-3.7.7.1" config EMBTK_SQLITE_VERSION_3_7_4 bool "sqlite-3.7.4" config EMBTK_SQLITE_VERSION_3_7_3 @@ -41,8 +44,9 @@ endchoice config EMBTK_SQLITE_VERSION_STRING string - default "3.7.3" if EMBTK_SQLITE_VERSION_3_7_3 + default "3070701" if EMBTK_SQLITE_VERSION_3_7_7_1 default "3070400" if EMBTK_SQLITE_VERSION_3_7_4 + default "3.7.3" if EMBTK_SQLITE_VERSION_3_7_3 config EMBTK_SQLITE_NEED_PATCH bool diff --git a/packages/database/sqlite/sqlite.mk b/packages/database/sqlite/sqlite.mk index 8d059d2..8939f6e 100644 --- a/packages/database/sqlite/sqlite.mk +++ b/packages/database/sqlite/sqlite.mk @@ -23,42 +23,36 @@ # \date October 2010 ################################################################################ -SQLITE_NAME := sqlite -SQLITE_VERSION := $(call embtk_get_pkgversion,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) +SQLITE_NAME := sqlite +SQLITE_VERSION := $(call embtk_get_pkgversion,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_PACKAGE := $(if $(CONFIG_EMBTK_SQLITE_VERSION_3_7_3), \ + sqlite-amalgamation-$(SQLITE_VERSION).tar.gz, \ + sqlite-autoconf-$(SQLITE_VERSION).tar.gz) +SQLITE_SRC_DIR := $(if $(CONFIG_EMBTK_SQLITE_VERSION_3_7_3), \ + $(PACKAGES_BUILD)/sqlite-$(SQLITE_VERSION), \ + $(PACKAGES_BUILD)/sqlite-autoconf-$(SQLITE_VERSION)) +SQLITE_BUILD_DIR := $(if $(CONFIG_EMBTK_SQLITE_VERSION_3_7_3), \ + $(PACKAGES_BUILD)/sqlite-$(SQLITE_VERSION), \ + $(PACKAGES_BUILD)/sqlite-autoconf-$(SQLITE_VERSION)) -SQLITE_BINS = sqlite3 -SQLITE_SBINS = -SQLITE_INCLUDES = sqlite3.h sqlite3ext.h -SQLITE_LIBS = libsqlite3.* -SQLITE_PKGCONFIGS = sqlite3.pc +SQLITE_BINS = sqlite3 +SQLITE_SBINS = +SQLITE_INCLUDES = sqlite3.h sqlite3ext.h +SQLITE_LIBS = libsqlite3.* +SQLITE_PKGCONFIGS = sqlite3.pc -SQLITE_CONFIGURE_OPTS := --enable-threadsafe --enable-readline \ - --enable-threadsafe --enable-dynamic-extensions - - -SQLITE_DEPS := +SQLITE_CONFIGURE_OPTS := --enable-threadsafe --enable-readline \ + --enable-dynamic-extensions sqlite_install: - $(call embtk_install_pkg,SQLITE) + $(call embtk_install_pkg,sqlite) download_sqlite: - $(call embtk_download_pkg,SQLITE) + $(call embtk_download_pkg,sqlite) sqlite_clean: - $(call embtk_cleanup_pkg,SQLITE) + $(call embtk_cleanup_pkg,sqlite) |