Browse Source

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 <sebastian_ml@gmx.net>
lilik-openwrt-22.03
Sebastian Kemper 6 years ago
parent
commit
7cfabe8de4
1 changed files with 3 additions and 9 deletions
  1. +3
    -9
      lang/python/python-mysql/Makefile

+ 3
- 9
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


Loading…
Cancel
Save