From 54166491e8d8be544e9e8097b512704aab861f8b Mon Sep 17 00:00:00 2001 From: hgy59 Date: Wed, 20 Nov 2024 21:53:31 +0100 Subject: [PATCH] python.mk: revert support for ADDITIONAL_CROSSENV_WHEELS - obsolete with wheel specific crossenv --- mk/spksrc.python.mk | 10 ---------- spk/rdiff-backup/Makefile | 3 --- 2 files changed, 13 deletions(-) diff --git a/mk/spksrc.python.mk b/mk/spksrc.python.mk index 6a219c1a0ec..59992b12d05 100644 --- a/mk/spksrc.python.mk +++ b/mk/spksrc.python.mk @@ -53,9 +53,6 @@ PYTHON_DEPENDS := $(foreach cross,$(foreach pkg_name,$(shell $(MAKE) dependency- # call-up pre-depend to prepare the shared python build environment PRE_DEPEND_TARGET = python_pre_depend -ifneq ($(strip $(ADDITIONAL_CROSSENV_WHEELS)),) -POST_DEPEND_TARGET = python_post_depend -endif else ifneq ($(findstring $(ARCH),$(ARMv5_ARCHS) $(OLD_PPC_ARCHS)),$(ARCH)) @@ -86,10 +83,3 @@ python_pre_depend: rm -fr work-*/$${pkgname}* work-*/.$${pkgname}-* ; \ fi ; \ done - -.PHONY: python_post_depend -python_post_depend: - @$(MSG) "Install to crossenv: $(ADDITIONAL_CROSSENV_WHEELS)" - @. $(WORK_DIR)/crossenv/bin/activate ; \ - $(RUN) build-pip --disable-pip-version-check install $(ADDITIONAL_CROSSENV_WHEELS) ; \ - $(RUN) pip --disable-pip-version-check install $(ADDITIONAL_CROSSENV_WHEELS) diff --git a/spk/rdiff-backup/Makefile b/spk/rdiff-backup/Makefile index 6e09b10c85d..b21b2d30af8 100644 --- a/spk/rdiff-backup/Makefile +++ b/spk/rdiff-backup/Makefile @@ -11,9 +11,6 @@ WHEELS = src/requirements-crossenv.txt src/requirements-pure.txt DEPENDS = cross/librsync cross/attr cross/acl -# required to build frozenlist and yarl -ADDITIONAL_CROSSENV_WHEELS = expandvars==0.12.0 - # [PyYAML] DEPENDS += cross/libyaml