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.

Sign up for GitHub

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

Add wheel top-level status cookie and mark armv5 as unsupported >= python 3.12 #6428

Merged
merged 2 commits into from
Jan 29, 2025
+20 −2
Merged

Add wheel top-level status cookie and mark armv5 as unsupported >= python 3.12 #6428

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7de060a
wheel.mk: Add .wheel_done status cookie management
th0ma7 Jan 26, 2025
1df02f6
python.mk: Mark ARMv5 as unsupported with python >= 3.12
th0ma7 Jan 26, 2025
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
7 changes: 6 additions & 1 deletion mk/spksrc.python.mk
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
Loading