Browse Source

sqlite3: Set platform configuration flags & cleanup

Set platform specfic flags to avoid sqlite using built-in variants
Remove CONFIGURE_VARS, already properly set by toolchain
Change order of TARGET_CFLAGS to match upstream documentation

Signed-off-by: Daniel Engberg <daniel.engberg.lists@pyret.net>
lilik-openwrt-22.03
Daniel Engberg 6 years ago
parent
commit
6ec6862d56
1 changed files with 3 additions and 11 deletions
  1. +3
    -11
      libs/sqlite3/Makefile

+ 3
- 11
libs/sqlite3/Makefile View File

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=sqlite PKG_NAME:=sqlite
PKG_VERSION:=3260000 PKG_VERSION:=3260000
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-autoconf-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-autoconf-$(PKG_VERSION).tar.gz
PKG_HASH:=5daa6a3fb7d1e8c767cd59c4ded8da6e4b00c61d3b466d0685e35c4dd6d7bf5d PKG_HASH:=5daa6a3fb7d1e8c767cd59c4ded8da6e4b00c61d3b466d0685e35c4dd6d7bf5d
@ -76,9 +76,9 @@ $(call Package/sqlite3/Default/description)
endef endef
TARGET_CFLAGS += \ TARGET_CFLAGS += \
-DSQLITE_ENABLE_UNLOCK_NOTIFY=1 \
-DHAVE_ISNAN=1 \ -DHAVE_ISNAN=1 \
-DHAVE_MALLOC_USABLE_SIZE=1
-DHAVE_MALLOC_USABLE_SIZE=1 \
-DSQLITE_ENABLE_UNLOCK_NOTIFY=1
ifneq ($(CONFIG_SQLITE_FTS3),y) ifneq ($(CONFIG_SQLITE_FTS3),y)
TARGET_CFLAGS += -USQLITE_ENABLE_FTS3 TARGET_CFLAGS += -USQLITE_ENABLE_FTS3
@ -94,14 +94,6 @@ CONFIGURE_ARGS += \
--disable-editline \ --disable-editline \
--disable-static-shell --disable-static-shell
CONFIGURE_VARS += \
config_BUILD_CC="$(HOSTCC)" \
config_BUILD_CFLAGS="-O2" \
config_TARGET_CC="$(TARGET_CC)" \
config_TARGET_CFLAGS="$(TARGET_CFLAGS)" \
config_TARGET_READLINE_INC="$(TARGET_CPPFLAGS)" \
config_TARGET_READLINE_LIBS="$(TARGET_LDFLAGS) -lreadline -lncurses" \
define Build/InstallDev define Build/InstallDev
$(INSTALL_DIR) $(1)/usr/include $(INSTALL_DIR) $(1)/usr/include
$(CP) $(PKG_INSTALL_DIR)/usr/include/sqlite3{,ext}.h $(1)/usr/include/ $(CP) $(PKG_INSTALL_DIR)/usr/include/sqlite3{,ext}.h $(1)/usr/include/


Loading…
Cancel
Save