diff --git a/package/sqlite/sqlite.mk b/package/sqlite/sqlite.mk index 5a8b033ce0..a23f6e1d66 100644 --- a/package/sqlite/sqlite.mk +++ b/package/sqlite/sqlite.mk @@ -21,6 +21,14 @@ ifeq ($(BR2_PACKAGE_SQLITE_ENABLE_COLUMN_METADATA),y) SQLITE_CFLAGS += -DSQLITE_ENABLE_COLUMN_METADATA endif +ifeq ($(BR2_PACKAGE_SQLITE_ENABLE_FTS3),y) +SQLITE_CFLAGS += -DSQLITE_ENABLE_FTS3 +endif + +ifeq ($(BR2_PACKAGE_SQLITE_ENABLE_JSON1),y) +SQLITE_CFLAGS += -DSQLITE_ENABLE_JSON1 +endif + ifeq ($(BR2_PACKAGE_SQLITE_ENABLE_UNLOCK_NOTIFY),y) SQLITE_CFLAGS += -DSQLITE_ENABLE_UNLOCK_NOTIFY endif @@ -42,64 +50,30 @@ else SQLITE_CFLAGS += $(subst -Ofast,-O3,$(TARGET_CFLAGS)) endif -ifeq ($(BR2_PACKAGE_NCURSES)$(BR2_PACKAGE_READLINE),yy) -SQLITE_DEPENDENCIES += ncurses readline -else ifeq ($(BR2_PACKAGE_LIBEDIT),y) -SQLITE_DEPENDENCIES += libedit -SQLITE_CONF_OPTS += --disable-readline --editline -else -SQLITE_CONF_OPTS += --disable-readline -endif - -ifeq ($(BR2_PACKAGE_SQLITE_ENABLE_FTS3),y) -SQLITE_CONF_OPTS += --fts3 -endif - -ifeq ($(BR2_PACKAGE_SQLITE_ENABLE_JSON1),) -SQLITE_CONF_OPTS += --disable-json -endif - SQLITE_CONF_ENV = CFLAGS="$(SQLITE_CFLAGS)" -define SQLITE_CONFIGURE_CMDS - (cd $(@D); $(TARGET_CONFIGURE_OPTS) $(SQLITE_CONF_ENV) ./configure \ - --prefix=/usr \ - --host="$(GNU_TARGET_NAME)" \ - --build="$(GNU_HOST_NAME)" \ - --sysroot="$(STAGING_DIR)" \ - $(SQLITE_CONF_OPTS) \ - ) -endef +ifeq ($(BR2_STATIC_LIBS),y) +SQLITE_CONF_OPTS += --enable-dynamic-extensions=no +else +SQLITE_CONF_OPTS += --disable-static-shell +endif -define SQLITE_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -endef +ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) +SQLITE_CONF_OPTS += --enable-threadsafe +else +SQLITE_CONF_OPTS += --disable-threadsafe +SQLITE_CFLAGS += -DSQLITE_THREADSAFE=0 +endif -define SQLITE_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) DESTDIR="$(STAGING_DIR)" -C $(@D) install -endef +ifeq ($(BR2_PACKAGE_NCURSES)$(BR2_PACKAGE_READLINE),yy) +SQLITE_DEPENDENCIES += ncurses readline +SQLITE_CONF_OPTS += --disable-editline --enable-readline +else ifeq ($(BR2_PACKAGE_LIBEDIT),y) +SQLITE_DEPENDENCIES += libedit +SQLITE_CONF_OPTS += --enable-editline --disable-readline +else +SQLITE_CONF_OPTS += --disable-editline --disable-readline +endif -define SQLITE_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) DESTDIR="$(TARGET_DIR)" -C $(@D) install -endef - -define HOST_SQLITE_CONFIGURE_CMDS - (cd $(@D); $(HOST_CONFIGURE_OPTS) $(SQLITE_CONF_ENV) ./configure \ - --prefix=/usr \ - --host="$(GNU_HOST_NAME)" \ - --build="$(GNU_HOST_NAME)" \ - --sysroot="$(HOST_DIR)" \ - $(SQLITE_CONF_OPTS) \ - ) -endef - -define HOST_SQLITE_BUILD_CMDS - $(HOST_MAKE_ENV) $(MAKE) -C $(@D) -endef - -define HOST_SQLITE_INSTALL_CMDS - $(HOST_MAKE_ENV) $(MAKE) DESTDIR="$(HOST_DIR)" -C $(@D) install -endef - -$(eval $(generic-package)) -$(eval $(host-generic-package)) +$(eval $(autotools-package)) +$(eval $(host-autotools-package))