From 9d236132c664ced34ebe7295dea0f9050b1b82d6 Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Sun, 8 Jul 2018 10:39:37 +0200 Subject: [PATCH 1/2] python-mysql: fix download URL During a previous pull request the PKG_NAME was first changed and then reverted back. But the download URL was not changed accordingly. Signed-off-by: Sebastian Kemper --- lang/python/python-mysql/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lang/python/python-mysql/Makefile b/lang/python/python-mysql/Makefile index 5de2e1ecc..607ba914f 100644 --- a/lang/python/python-mysql/Makefile +++ b/lang/python/python-mysql/Makefile @@ -13,7 +13,7 @@ PKG_RELEASE:=1 PKG_LICENSE:=GPL-2.0 PKG_SOURCE:=mysqlclient-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=https://files.pythonhosted.org/packages/source/m/$(PKG_NAME) +PKG_SOURCE_URL:=https://files.pythonhosted.org/packages/source/m/mysqlclient PKG_HASH:=2d9ec33de39f4d9c64ad7322ede0521d85829ce36a76f9dd3d6ab76a9c8648e5 PKG_BUILD_DIR:=$(BUILD_DIR)/$(BUILD_VARIANT)-mysql-$(PKG_VERSION) From 230bfc96ac891c8badb48c4f2667a50e8192d9d5 Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Sun, 8 Jul 2018 10:43:02 +0200 Subject: [PATCH 2/2] python-mysql: fix uclibc build failure libmariadb 10.2.x needs to be linked in together with iconv. On uclibc iconv is not included in libc and libiconv-full needs to be used. This commit helps python-mysql find the shared library. Signed-off-by: Sebastian Kemper --- lang/python/python-mysql/Makefile | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/lang/python/python-mysql/Makefile b/lang/python/python-mysql/Makefile index 607ba914f..09fd2420c 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:=1 +PKG_RELEASE:=2 PKG_LICENSE:=GPL-2.0 PKG_SOURCE:=mysqlclient-$(PKG_VERSION).tar.gz @@ -24,6 +24,14 @@ include ../python3-package.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