Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rdiff-backup: update and use alternate tmp dir (#4427) #6049

Merged
merged 7 commits into from
Nov 14, 2024
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
python.mk: Allow ADDITIONAL_CROSSENV_WHEELS for extra crossenv dep
(cherry picked from commit 5c16182)
th0ma7 authored and hgy59 committed Nov 10, 2024
commit d4886462fba2d8be4f3388df4e79ef7ed187d7a7
9 changes: 9 additions & 0 deletions mk/spksrc.python.mk
Original file line number Diff line number Diff line change
@@ -54,6 +54,9 @@ 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,3 +89,9 @@ python_pre_depend:
rm -fr work-*/$${pkgname}* work-*/.$${pkgname}-* ; \
fi ; \
done

.PHONY: python_post_depend
python_post_depend:
@. $(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)