Browse Source

python-mysql: upgrade to 1.3.12

- change source from MySQL-python to mysqlclient, which is a fork of the
  former. The former project hasn't seen any updates in years.
- this is also in anticipation of the upgrade of MariaDB from 10.1.x to
  10.2.x. With the latter python-mysql does not compile - mysqlclient
  does.
- the patch is dropped as libmaria is threadsafe anyway.
- add variant for Python3.

Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
lilik-openwrt-22.03
Sebastian Kemper 7 years ago
parent
commit
91c6f4f82c
2 changed files with 35 additions and 30 deletions
  1. +35
    -19
      lang/python/python-mysql/Makefile
  2. +0
    -11
      lang/python/python-mysql/patches/010-threadsafe.patch

+ 35
- 19
lang/python/python-mysql/Makefile View File

@ -1,5 +1,5 @@
# #
# Copyright (C) 2007-2014 OpenWrt.org
# Copyright (C) 2007-2018 OpenWrt.org
# #
# This is free software, licensed under the GNU General Public License v2. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.
@ -7,26 +7,43 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=MySQL-python
PKG_VERSION:=1.2.5
PKG_NAME:=python-mysql
PKG_VERSION:=1.3.12
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_LICENSE:=GPL-2.0 PKG_LICENSE:=GPL-2.0
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).zip
PKG_SOURCE_URL:=https://pypi.python.org/packages/source/M/MySQL-python/
PKG_HASH:=811040b647e5d5686f84db415efd697e6250008b112b6909ba77ac059e140c74
PKG_SOURCE:=mysqlclient-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://files.pythonhosted.org/packages/source/m/$(PKG_NAME)
PKG_HASH:=2d9ec33de39f4d9c64ad7322ede0521d85829ce36a76f9dd3d6ab76a9c8648e5
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
define Package/python-mysql
PKG_UNPACK:=$(HOST_TAR) -C $(PKG_BUILD_DIR) --strip-components=1 -xzf $(DL_DIR)/$(PKG_SOURCE)
define Package/python-mysql/Default
SUBMENU:=Python SUBMENU:=Python
SECTION:=lang SECTION:=lang
CATEGORY:=Languages CATEGORY:=Languages
TITLE:=MySQL database adapter for Python
URL:=https://pypi.python.org/pypi/MySQL-python
URL:=https://pypi.python.org/project/mysqlclient
MAINTAINER:=Gergely Kiss <mail.gery@gmail.com> MAINTAINER:=Gergely Kiss <mail.gery@gmail.com>
DEPENDS:=+python +libmysqlclient
endef
define Package/python-mysql
$(call Package/python-mysql/Default)
TITLE:=MySQL database adapter for Python
DEPENDS:=+PACKAGE_python-mysql:python +libmysqlclient
VARIANT:=python
endef
define Package/python3-mysql
$(call Package/python-mysql/Default)
TITLE:=MySQL database adapter for Python3
DEPENDS:=+PACKAGE_python3-mysql:python3 +libmysqlclient
VARIANT:=python3
endef endef
define Package/python-mysql/description define Package/python-mysql/description
@ -34,15 +51,14 @@ define Package/python-mysql/description
server that provides the Python database API. server that provides the Python database API.
endef endef
define Build/Compile
$(call Build/Compile/PyMod,,install --prefix=/usr --root=$(PKG_INSTALL_DIR))
endef
define Package/python-mysql/install
$(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR)
$(CP) \
$(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/* \
$(1)$(PYTHON_PKG_DIR)
define Package/python3-mysql/description
$(call Package/python-mysql/description)
.
(Variant for Python3)
endef endef
$(eval $(call PyPackage,python-mysql))
$(eval $(call BuildPackage,python-mysql)) $(eval $(call BuildPackage,python-mysql))
$(eval $(call Py3Package,python3-mysql))
$(eval $(call BuildPackage,python3-mysql))

+ 0
- 11
lang/python/python-mysql/patches/010-threadsafe.patch View File

@ -1,11 +0,0 @@
--- MySQL-python-1.2.2/site_orig.cfg 2007-08-15 12:58:40.000000000 +0200
+++ MySQL-python-1.2.2/site.cfg 2007-08-15 12:58:49.000000000 +0200
@@ -4,7 +4,7 @@
# static: link against a static library (probably required for embedded)
embedded = False
-threadsafe = True
+threadsafe = False
static = False
# The path to mysql_config.

Loading…
Cancel
Save