Skip to content

Commit

Permalink
Add wheel top-level status cookie and mark armv5 as unsupported >= py…
Browse files Browse the repository at this point in the history
…thon 3.12 (#6428)

* wheel.mk: Add .wheel_done status cookie management

* python.mk: Mark ARMv5 as unsupported with python >= 3.12
  • Loading branch information
th0ma7 authored Jan 29, 2025
1 parent c4ced34 commit eaccddc
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 2 deletions.
7 changes: 6 additions & 1 deletion mk/spksrc.python.mk
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,12 @@
# set default spk/python* path to use
PYTHON_PACKAGE_WORK_DIR = $(realpath $(CURDIR)/../../spk/$(PYTHON_PACKAGE)/work-$(ARCH)-$(TCVERSION))

include ../../mk/spksrc.archs.mk
include ../../mk/spksrc.common.mk

# armv5 no longer supported with python >= 3.12
ifeq ($(call version_ge, $(subst python,,$(PYTHON_PACKAGE)), 312), 1)
UNSUPPORTED_ARCHS += $(ARMv5_ARCHS)
endif

ifneq ($(wildcard $(PYTHON_PACKAGE_WORK_DIR)),)

Expand Down
1 change: 1 addition & 0 deletions mk/spksrc.spk.mk
Original file line number Diff line number Diff line change
Expand Up @@ -525,6 +525,7 @@ spkclean:
work-*/.depend_done \
work-*/.icon_done \
work-*/.strip_done \
work-*/.wheel_done \
work-*/conf \
work-*/scripts \
work-*/staging \
Expand Down
14 changes: 13 additions & 1 deletion mk/spksrc.wheel.mk
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@
# make download-wheels : MAKECMDGOALS is download-wheels
WHEEL_GOAL := $(if $(MAKECMDGOALS),$(MAKECMDGOALS),wheel)

# Completion status file
WHEEL_COOKIE = $(WORK_DIR)/.wheel_done

## python wheel specific configurations
include ../../mk/spksrc.wheel-env.mk

Expand Down Expand Up @@ -149,7 +152,16 @@ download-wheels: $(WHEEL_TARGET)

post_wheel_target: $(WHEEL_TARGET) install_python_wheel

wheel: post_wheel_target
ifeq ($(wildcard $(WHEEL_COOKIE)),)
wheel: $(WHEEL_COOKIE)

$(WHEEL_COOKIE): $(POST_WHEEL_TARGET)
$(create_target_dir)
@touch -f $@

else
wheel: ;
endif

# endif REQUIREMENT non-empty
endif

0 comments on commit eaccddc

Please sign in to comment.