Skip to content

Commit eaccddc

Browse files
authored
Add wheel top-level status cookie and mark armv5 as unsupported >= python 3.12 (#6428)
* wheel.mk: Add .wheel_done status cookie management * python.mk: Mark ARMv5 as unsupported with python >= 3.12
1 parent c4ced34 commit eaccddc

File tree

3 files changed

+20
-2
lines changed

3 files changed

+20
-2
lines changed

mk/spksrc.python.mk

+6-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,12 @@
77
# set default spk/python* path to use
88
PYTHON_PACKAGE_WORK_DIR = $(realpath $(CURDIR)/../../spk/$(PYTHON_PACKAGE)/work-$(ARCH)-$(TCVERSION))
99

10-
include ../../mk/spksrc.archs.mk
10+
include ../../mk/spksrc.common.mk
11+
12+
# armv5 no longer supported with python >= 3.12
13+
ifeq ($(call version_ge, $(subst python,,$(PYTHON_PACKAGE)), 312), 1)
14+
UNSUPPORTED_ARCHS += $(ARMv5_ARCHS)
15+
endif
1116

1217
ifneq ($(wildcard $(PYTHON_PACKAGE_WORK_DIR)),)
1318

mk/spksrc.spk.mk

+1
Original file line numberDiff line numberDiff line change
@@ -525,6 +525,7 @@ spkclean:
525525
work-*/.depend_done \
526526
work-*/.icon_done \
527527
work-*/.strip_done \
528+
work-*/.wheel_done \
528529
work-*/conf \
529530
work-*/scripts \
530531
work-*/staging \

mk/spksrc.wheel.mk

+13-1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@
1818
# make download-wheels : MAKECMDGOALS is download-wheels
1919
WHEEL_GOAL := $(if $(MAKECMDGOALS),$(MAKECMDGOALS),wheel)
2020

21+
# Completion status file
22+
WHEEL_COOKIE = $(WORK_DIR)/.wheel_done
23+
2124
## python wheel specific configurations
2225
include ../../mk/spksrc.wheel-env.mk
2326

@@ -149,7 +152,16 @@ download-wheels: $(WHEEL_TARGET)
149152

150153
post_wheel_target: $(WHEEL_TARGET) install_python_wheel
151154

152-
wheel: post_wheel_target
155+
ifeq ($(wildcard $(WHEEL_COOKIE)),)
156+
wheel: $(WHEEL_COOKIE)
157+
158+
$(WHEEL_COOKIE): $(POST_WHEEL_TARGET)
159+
$(create_target_dir)
160+
@touch -f $@
161+
162+
else
163+
wheel: ;
164+
endif
153165

154166
# endif REQUIREMENT non-empty
155167
endif

0 commit comments

Comments
 (0)