Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #6467 from micmac1/python-mysql-nls

Browse source 
python-mysql: include nls.mk, remove hack
This commit is contained in:
Hannu Nyman 2018-07-16 16:56:42 +03:00 committed by GitHub
commit 6132b459e2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lang/python/python-mysql/Makefile
View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=python-mysql PKG_NAME:=python-mysql
PKG_VERSION:=1.3.12 PKG_VERSION:=1.3.12
PKG_RELEASE:=2 PKG_RELEASE:=3
PKG_LICENSE:=GPL-2.0 PKG_LICENSE:=GPL-2.0
PKG_SOURCE:=mysqlclient-$(PKG_VERSION).tar.gz 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 $(INCLUDE_DIR)/package.mk
include ../python-package.mk include ../python-package.mk
include ../python3-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) 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 define Package/python-mysql/Default
SUBMENU:=Python SUBMENU:=Python
SECTION:=lang SECTION:=lang