diff options
author | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2011-01-08 19:51:26 +0100 |
---|---|---|
committer | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2011-01-08 19:51:54 +0100 |
commit | 6d2bcbeda707b9f8ee8e72624a6e5823915bbab3 (patch) | |
tree | 6686fea6323bb7c31f6f455e0b6acc0bb1b4dac3 | |
parent | 666431f7a61239ef47e43e30e246b771bf7d4725 (diff) | |
download | embtoolkit-6d2bcbeda707b9f8ee8e72624a6e5823915bbab3.tar.gz embtoolkit-6d2bcbeda707b9f8ee8e72624a6e5823915bbab3.tar.bz2 embtoolkit-6d2bcbeda707b9f8ee8e72624a6e5823915bbab3.tar.xz |
Packages: sqlite: convert sqlite to use configure macro
Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
-rw-r--r-- | mk/macros.mk | 3 | ||||
-rw-r--r-- | packages/database/sqlite/sqlite.mk | 27 |
2 files changed, 8 insertions, 22 deletions
diff --git a/mk/macros.mk b/mk/macros.mk index 0a20e1f..0ddb5b5 100644 --- a/mk/macros.mk +++ b/mk/macros.mk @@ -215,6 +215,7 @@ define EMBTK_PRINT_CONFIGURE_OPTS endef define EMBTK_CONFIGURE_PKG $(call EMBTK_GENERIC_MESSAGE,"Configure $(strip $(1))...") + @test -e $(strip $(3))/configure || exit 1 $(call EMBTK_PRINT_CONFIGURE_OPTS,"$(strip $(4))") @cd $(strip $(2)); \ CC=$(TARGETCC_CACHED) \ @@ -237,6 +238,6 @@ define EMBTK_CONFIGURE_PKG --build=$(HOST_BUILD) --host=$(STRICT_GNU_TARGET) \ --target=$(STRICT_GNU_TARGET) --libdir=/usr/$(LIBDIR) \ --prefix=/usr $(strip $(4)) - $(Q)touch $(strip $(2))/.configured + @touch $(strip $(2))/.configured $(call EMBTK_KILL_LT_RPATH,$(strip $(2))) endef diff --git a/packages/database/sqlite/sqlite.mk b/packages/database/sqlite/sqlite.mk index cc6e771..1877cb3 100644 --- a/packages/database/sqlite/sqlite.mk +++ b/packages/database/sqlite/sqlite.mk @@ -27,6 +27,7 @@ SQLITE_VERSION := $(subst ",,$(strip $(CONFIG_EMBTK_SQLITE_VERSION_STRING))) SQLITE_SITE := http://www.sqlite.org SQLITE_PATCH_SITE := ftp://ftp.embtoolkit.org/embtoolkit.org/sqlite/$(SQLITE_VERSION) SQLITE_PACKAGE := sqlite-amalgamation-$(SQLITE_VERSION).tar.gz +SQLITE_SRC_DIR := $(PACKAGES_BUILD)/sqlite-$(SQLITE_VERSION) SQLITE_BUILD_DIR := $(PACKAGES_BUILD)/sqlite-$(SQLITE_VERSION) SQLITE_BINS = sqlite3 @@ -78,27 +79,11 @@ endif @touch $@ $(SQLITE_BUILD_DIR)/.configured: - $(Q)cd $(SQLITE_BUILD_DIR); \ - CC=$(TARGETCC_CACHED) \ - CXX=$(TARGETCXX_CACHED) \ - AR=$(TARGETAR) \ - RANLIB=$(TARGETRANLIB) \ - AS=$(CROSS_COMPILE)as \ - LD=$(TARGETLD) \ - NM=$(TARGETNM) \ - STRIP=$(TARGETSTRIP) \ - OBJDUMP=$(TARGETOBJDUMP) \ - OBJCOPY=$(TARGETOBJCOPY) \ - CFLAGS="$(TARGET_CFLAGS)" \ - CXXFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="-L$(SYSROOT)/$(LIBDIR) -L$(SYSROOT)/usr/$(LIBDIR)" \ - CPPFLAGS="-I$(SYSROOT)/usr/include" \ - PKG_CONFIG=$(PKGCONFIG_BIN) \ - PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) \ - ./configure --build=$(HOST_BUILD) --host=$(STRICT_GNU_TARGET) \ - --target=$(STRICT_GNU_TARGET) --libdir=/usr/$(LIBDIR) \ - --prefix=/usr $(SQLITE_CONFIGURE_OPTS) - @touch $@ + $(call EMBTK_CONFIGURE_PKG, \ + $(SQLITE_PACKAGE), \ + $(SQLITE_BUILD_DIR), \ + $(SQLITE_SRC_DIR), \ + $(SQLITE_CONFIGURE_OPTS)) sqlite_clean: $(call EMBTK_GENERIC_MESSAGE,"cleanup sqlite...") |