From 6e55df6ccb85fc95c55bfb0c18c6f5de53dbecac Mon Sep 17 00:00:00 2001 From: Jeffery To Date: Tue, 19 Feb 2019 15:29:21 +0800 Subject: [PATCH] python-txsocks: Fix twisted dependency This fixes the dependency on twisted, which was renamed to python-twisted earlier. This also changes the package to use the default PyBuild/Compile. Signed-off-by: Jeffery To --- lang/python/python-txsocksx/Makefile | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/lang/python/python-txsocksx/Makefile b/lang/python/python-txsocksx/Makefile index e8a7605b1..45d2207e1 100644 --- a/lang/python/python-txsocksx/Makefile +++ b/lang/python/python-txsocksx/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=python-txsocksx PKG_VERSION:=1.15.0.2 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=txsocksx-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://pypi.python.org/packages/source/t/txsocksx @@ -26,6 +26,9 @@ include ../python-package.mk PKG_UNPACK:=$(HOST_TAR) -C $(PKG_BUILD_DIR) --strip-components=1 -xzf $(DL_DIR)/$(PKG_SOURCE) +PYTHON_PKG_SETUP_VARS:= \ + PKG_VERSION="$(PKG_VERSION)" + define Package/python-txsocksx/Default SECTION:=lang CATEGORY:=Languages @@ -39,7 +42,7 @@ $(call Package/python-txsocksx/Default) DEPENDS:= \ +PACKAGE_python-txsocksx:python-light \ +PACKAGE_python-txsocksx:python-parsley \ - +PACKAGE_python-txsocksx:twisted + +PACKAGE_python-txsocksx:python-twisted VARIANT:=python endef @@ -48,13 +51,6 @@ txsocksx is SOCKS4/4a and SOCKS5 client endpoints for Twisted 10.1 or greater. endef -define PyBuild/Compile - $(call Build/Compile/PyMod,, \ - install --prefix="/usr" --root="$(PKG_INSTALL_DIR)", \ - PKG_VERSION="$(PKG_VERSION)" \ - ) -endef - $(eval $(call PyPackage,python-txsocksx)) $(eval $(call BuildPackage,python-txsocksx)) $(eval $(call BuildPackage,python-txsocksx-src))