diff --git a/lang/python/python3-package.mk b/lang/python/python3-package.mk index 5673d15bb0..96fafe4450 100644 --- a/lang/python/python3-package.mk +++ b/lang/python/python3-package.mk @@ -204,6 +204,17 @@ define Py3Build/FindStdlibDepends $(SHELL) $(python3_mk_path)python3-find-stdlib-depends.sh -n "$(PKG_NAME)" "$(PKG_BUILD_DIR)" endef +ifneq ($(strip $(PYPI_NAME)),) +define Py3Build/CheckHostPipVersionMatch + if grep -q "$(PYPI_NAME)==" $(python3_mk_path)host-pip-requirements/*.txt ; then \ + if ! grep -q "$(PYPI_NAME)==$(PKG_VERSION)" $(python3_mk_path)host-pip-requirements/*.txt ; then \ + printf "\nPlease update version of $(PYPI_NAME) to $(PKG_VERSION) in 'host-pip-requirements'/\n\n" ; \ + exit 1 ; \ + fi \ + fi +endef +endif + define Py3Build/Compile/Default $(if $(PYTHON3_PKG_HOST_PIP_INSTALL_ARGS), \ $(call HostPython3/PipInstall,$(PYTHON3_PKG_HOST_PIP_INSTALL_ARGS)) \ @@ -226,5 +237,6 @@ ifeq ($(strip $(PYTHON3_PKG_BUILD)),1) ifeq ($(PY3),stdlib) Hooks/Configure/Post+=Py3Build/FindStdlibDepends endif + Hooks/Configure/Post+=Py3Build/CheckHostPipVersionMatch Build/Compile=$(Py3Build/Compile) endif diff --git a/lang/python/host-pip-requirements/Django-1.11.txt b/net/seafile-seahub/Django-1.11.txt similarity index 100% rename from lang/python/host-pip-requirements/Django-1.11.txt rename to net/seafile-seahub/Django-1.11.txt diff --git a/net/seafile-seahub/Makefile b/net/seafile-seahub/Makefile index 0e4e8af24c..d16ae9f667 100644 --- a/net/seafile-seahub/Makefile +++ b/net/seafile-seahub/Makefile @@ -21,7 +21,7 @@ PKG_LICENSE_FILES:=LICENSE.txt PKG_BUILD_DIR:=$(BUILD_DIR)/seahub-$(PKG_VERSION)-server -HOST_PYTHON3_PACKAGE_BUILD_DEPENDS:=Django-1.11 +HOST_PYTHON3_PACKAGE_BUILD_DEPENDS:=./Django-1.11.txt PKG_BUILD_PARALLEL:=1 PYTHON3_PKG_BUILD:=0