From: Daniel Engberg <daniel.engberg.lists@pyret.net>
Date: Thu, 20 Dec 2018 12:27:50 +0000 (+0100)
Subject: sqlite3: Set platform configuration flags & cleanup
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=6ec6862d56653cd95f5135341860a1f92a13a90a;p=feed%2Fpackages.git

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>
---

diff --git a/libs/sqlite3/Makefile b/libs/sqlite3/Makefile
index 71be4e1893..1e7f9cabe7 100644
--- a/libs/sqlite3/Makefile
+++ b/libs/sqlite3/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=sqlite
 PKG_VERSION:=3260000
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-autoconf-$(PKG_VERSION).tar.gz
 PKG_HASH:=5daa6a3fb7d1e8c767cd59c4ded8da6e4b00c61d3b466d0685e35c4dd6d7bf5d
@@ -76,9 +76,9 @@ $(call Package/sqlite3/Default/description)
 endef
 
 TARGET_CFLAGS += \
-	-DSQLITE_ENABLE_UNLOCK_NOTIFY=1 \
 	-DHAVE_ISNAN=1 \
-	-DHAVE_MALLOC_USABLE_SIZE=1
+	-DHAVE_MALLOC_USABLE_SIZE=1 \
+	-DSQLITE_ENABLE_UNLOCK_NOTIFY=1
 
 ifneq ($(CONFIG_SQLITE_FTS3),y)
 TARGET_CFLAGS += -USQLITE_ENABLE_FTS3
@@ -94,14 +94,6 @@ CONFIGURE_ARGS += \
 	--disable-editline \
 	--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
 	$(INSTALL_DIR) $(1)/usr/include
 	$(CP) $(PKG_INSTALL_DIR)/usr/include/sqlite3{,ext}.h $(1)/usr/include/