Skip to content

Commit

Permalink
python.mk: revert support for ADDITIONAL_CROSSENV_WHEELS
Browse files Browse the repository at this point in the history
- obsolete with wheel specific crossenv
  • Loading branch information
hgy59 committed Nov 20, 2024
1 parent 3557d39 commit 5416649
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 13 deletions.
10 changes: 0 additions & 10 deletions mk/spksrc.python.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down Expand Up @@ -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)
3 changes: 0 additions & 3 deletions spk/rdiff-backup/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 5416649

Please sign in to comment.