Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
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
6 changes: 3 additions & 3 deletions lang/python/pillow/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@
include $(TOPDIR)/rules.mk

PKG_NAME:=pillow
PKG_VERSION:=12.2.0
PKG_RELEASE:=2
PKG_VERSION:=12.3.0
PKG_RELEASE:=1

PYPI_NAME:=Pillow
PYPI_SOURCE_NAME:=pillow
PKG_HASH:=a830b1a40919539d07806aa58e1b114df53ddd43213d9c8b75847eee6c0182b5
PKG_HASH:=3b8182a766685eaa002637e28b4ec8d6b18819a0c71f579bf0dbaa5830297cce

PKG_BUILD_DEPENDS:=python-setuptools/host

Expand Down
4 changes: 2 additions & 2 deletions lang/python/python3-version.mk
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
# Note: keep in sync with pip
PYTHON3_VERSION_MAJOR:=3
PYTHON3_VERSION_MINOR:=14
PYTHON3_VERSION_MICRO:=5
PYTHON3_VERSION_MICRO:=7

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All ten Feeds Package Test Build jobs fail on the in-tree python3 patches going dirty against the 3.14.7 tarball, e.g. Test i386_pentium-mmx:

Applying patch 003-do-not-run-compileall.patch
patching file Makefile.pre.in
Hunk #1 succeeded at 2819 (offset 6 lines).
Refreshed patch 003-do-not-run-compileall.patch
...
Dirty patches detected, please refresh and review the diff
##[error]Process completed with exit code 1.

3.14.7 shifts the context in Makefile.pre.in, Python/initconfig.c and Modules/_ssl.c, so 003, 004, 009, 025 and 027 all come back modified from the refresh (024 and 026 are reported unchanged). Refreshing them with make package/python3/refresh and folding the result into the version-bump commit should clear this; the same error repeats in the other nine arch jobs.


Generated by Claude Code


PYTHON3_VERSION:=$(PYTHON3_VERSION_MAJOR).$(PYTHON3_VERSION_MINOR)

PYTHON3_PIP_PKG_RELEASE:=1
PYTHON3_PIP_VERSION:=26.1.1
PYTHON3_PIP_VERSION:=26.2.1
4 changes: 2 additions & 2 deletions lang/python/python3/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ include $(TOPDIR)/rules.mk
include ../python3-version.mk

PKG_NAME:=python3
PKG_RELEASE:=2
PKG_RELEASE:=1
PKG_VERSION:=$(PYTHON3_VERSION).$(PYTHON3_VERSION_MICRO)

PKG_SOURCE:=Python-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://www.python.org/ftp/python/$(PKG_VERSION)
PKG_HASH:=7e32597b99e5d9a39abed35de4693fa169df3e5850d4c334337ffd6a19a36db6
PKG_HASH:=3b48dac8fb59f62eaa67ac83c1eb12bda1b7a08406dd286e252c11a66be27f81

PKG_MAINTAINER:=Alexandru Ardelean <ardeleanalex@gmail.com>
PKG_LICENSE:=Python-2.0.1 0BSD
Expand Down
9 changes: 7 additions & 2 deletions lang/python/python3/patches/003-do-not-run-compileall.patch
Original file line number Diff line number Diff line change
@@ -1,14 +1,19 @@
From 8a4da017902d21ac6cada21a3bb23caa5b39af0b Mon Sep 17 00:00:00 2001
From: Jeffery To <jeffery.to@gmail.com>
Date: Fri, 12 May 2023 19:40:11 +0800
Subject: [PATCH] Do not run compileall

--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -2813,6 +2813,7 @@ libinstall: all $(srcdir)/Modules/xxmodu
@@ -2819,6 +2819,7 @@ libinstall: all $(srcdir)/Modules/xxmodu
echo "Applying app store compliance patch"; \
patch --force --reject-file "$(abs_builddir)/app-store-compliance.rej" --strip 2 --directory "$(DESTDIR)$(LIBDEST)" --input "$(abs_srcdir)/$(APP_STORE_COMPLIANCE_PATCH)" || true ; \
fi
+ifeq (1,)
@ # Build PYC files for the 3 optimization levels (0, 1, 2)
-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
$(PYTHON_FOR_BUILD) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \
@@ -2823,6 +2824,7 @@ libinstall: all $(srcdir)/Modules/xxmodu
@@ -2829,6 +2830,7 @@ libinstall: all $(srcdir)/Modules/xxmodu
$(PYTHON_FOR_BUILD) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \
-o 0 -o 1 -o 2 $(COMPILEALL_OPTS) -d $(LIBDEST)/site-packages -f \
-x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
From 5b85eff6b2d9107bfb5bed7d6b64ff0460f3bc16 Mon Sep 17 00:00:00 2001
From: Alexandru Ardelean <aa@ocedo.com>
Date: Thu, 13 Nov 2014 10:44:36 +0200
Subject: [PATCH] Do not write byte codes by default

--- a/Python/initconfig.c
+++ b/Python/initconfig.c
@@ -475,7 +475,7 @@ int Py_NoSiteFlag = 0; /* Suppress 'impo
@@ -499,7 +499,7 @@ int Py_NoSiteFlag = 0; /* Suppress 'impo
int Py_BytesWarningFlag = 0; /* Warn on str(bytes) and str(buffer) */
int Py_FrozenFlag = 0; /* Needed by getpath.c */
int Py_IgnoreEnvironmentFlag = 0; /* e.g. PYTHONPATH, PYTHONHOME */
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,19 @@
From 97a92f2e7a77c39d087892f5c9a7350c31f3d65b Mon Sep 17 00:00:00 2001
From: Alexandru Ardelean <alex@shruggie.ro>
Date: Sun, 24 Nov 2024 10:59:27 +0200
Subject: [PATCH] Do not run profile task during cross build

--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -852,6 +852,7 @@ profile-gen-stamp: profile-clean-stamp
@@ -856,6 +856,7 @@ profile-gen-stamp: profile-clean-stamp

# Run task with profile generation build to create profile information.
profile-run-stamp:
+ifneq ($(PROFILE_TASK),)
@echo "Running code to generate profile data (this can take a while):"
# First, we need to create a clean build with profile generation
# enabled.
@@ -865,6 +866,7 @@ profile-run-stamp:
@@ -869,6 +870,7 @@ profile-run-stamp:
# This is an expensive target to build and it does not have proper
# makefile dependency information. So, we create a "stamp" file
# to record its completion and avoid re-running it.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
From 18330902a0ca1b162e1ae938d8024cfb7e7c524d Mon Sep 17 00:00:00 2001
From: Jeffery To <jeffery.to@gmail.com>
Date: Tue, 16 Feb 2021 22:23:50 +0800
Subject: [PATCH] Choose python-config version

--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -2839,7 +2839,7 @@ python-config: $(srcdir)/Misc/python-con
@@ -2845,7 +2845,7 @@ python-config: $(srcdir)/Misc/python-con
@ # On Darwin, always use the python version of the script, the shell
@ # version doesn't use the compiler customizations that are provided
@ # in python (_osx_support.py).
Expand Down
11 changes: 8 additions & 3 deletions lang/python/python3/patches/027-fix-host-build-libressl.patch
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
From 49e3c330d4b5e17a740bc51b7ebbb9a42c67e505 Mon Sep 17 00:00:00 2001
From: Sean Khan <datapronix@protonmail.com>
Date: Thu, 27 Jun 2024 22:06:30 -0400
Subject: [PATCH] Fix host build with LibreSSL

--- a/Modules/_ssl.c
+++ b/Modules/_ssl.c
@@ -74,7 +74,10 @@
@@ -75,7 +75,10 @@
# error "OPENSSL_THREADS is not defined, Python requires thread-safe OpenSSL"
#endif

Expand All @@ -12,7 +17,7 @@

struct py_ssl_error_code {
const char *mnemonic;
@@ -4898,7 +4901,11 @@ _ssl__SSLContext_cert_store_stats_impl(P
@@ -4905,7 +4908,11 @@ _ssl__SSLContext_cert_store_stats_impl(P
int x509 = 0, crl = 0, ca = 0, i;

store = SSL_CTX_get_cert_store(self->ctx);
Expand All @@ -24,7 +29,7 @@
if (objs == NULL) {
PyErr_SetString(PyExc_MemoryError, "failed to query cert store");
return NULL;
@@ -4954,7 +4961,11 @@ _ssl__SSLContext_get_ca_certs_impl(PySSL
@@ -4961,7 +4968,11 @@ _ssl__SSLContext_get_ca_certs_impl(PySSL
}

store = SSL_CTX_get_cert_store(self->ctx);
Expand Down