From: Sebastian Kemper <redacted>
Date: Fri, 13 Jul 2018 20:58:50 +0000 (+0200)
Subject: python-mysql: include nls.mk, remove hack
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=7cfabe8de4b3c3653753878298e77f48031d9ec4;p=openwrt-packages.git

python-mysql: include nls.mk, remove hack

mariadb was sorted out to include nls.mk. Update python-mysql to do the
same and remove the hack.

Signed-off-by: Sebastian Kemper <redacted>
---

diff --git a/lang/python/python-mysql/Makefile b/lang/python/python-mysql/Makefile
index 09fd2420c..c3977c0db 100644
--- a/lang/python/python-mysql/Makefile
+++ b/lang/python/python-mysql/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-mysql
 PKG_VERSION:=1.3.12
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 PKG_LICENSE:=GPL-2.0
 
 PKG_SOURCE:=mysqlclient-$(PKG_VERSION).tar.gz
@@ -21,17 +21,11 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/$(BUILD_VARIANT)-mysql-$(PKG_VERSION)
 include $(INCLUDE_DIR)/package.mk
 include ../python-package.mk
 include ../python3-package.mk
+# python-mysql needs iconv
+include $(INCLUDE_DIR)/nls.mk
 
 PKG_UNPACK:=$(HOST_TAR) -C $(PKG_BUILD_DIR) --strip-components=1 -xzf $(DL_DIR)/$(PKG_SOURCE)
 
-# Help python-mysql find libiconv.so when using uClibc.
-ifneq ($(CONFIG_USE_UCLIBC),)
-TARGET_CPPFLAGS+= \
-	-I$(STAGING_DIR)/usr/lib/libiconv-full/include
-TARGET_LDFLAGS += \
-	-L$(STAGING_DIR)/usr/lib/libiconv-full/lib
-endif
-
 define Package/python-mysql/Default
   SUBMENU:=Python
   SECTION:=lang