Skip to content
Open
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
5 changes: 4 additions & 1 deletion main/configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -4140,9 +4140,12 @@ elif test -n "$with_system_python" -o -n "$with_system_libs" && \
python_version=`$PYTHON -c "import sysconfig; print(sysconfig.get_config_var('VERSION'));"`
# Python 3.8 and later distinguish building Python modules from linking to the libpython:
# (https://bugs.python.org/issue36721)
if test "$python_version" -lt "3.8"; then
# We cannot use test(1) because Python version numbers are in the "major.minor.micro" form
if $PYTHON -c "import sys; v = sys.version_info; g = ((v.major < 3) or ((v.major == 3) and (v.minor < 8))); sys.exit(not g)"; then
# < 3.8
PKG_CHECK_MODULES(PYTHON, python-$python_version, PYTHON_PC="TRUE", PYTHON_PC="" )
else
# >= 3.8
PKG_CHECK_MODULES(PYTHON, python-$python_version-embed, PYTHON_PC="TRUE", PYTHON_PC="" )
fi
if test "$PYTHON_PC" != "TRUE"; then
Expand Down
6 changes: 3 additions & 3 deletions main/external_deps.lst
Original file line number Diff line number Diff line change
Expand Up @@ -194,9 +194,9 @@ if (ENABLE_MEDIAWIKI == YES)
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)

if (SYSTEM_PYTHON != YES)
MD5 = 38c84292658ed4456157195f1c9bcbe1
name = Python-2.7.18.tgz
URL1 = https://www.python.org/ftp/python/2.7.18/$(name)
MD5 = 57f84cbd92d478ceff55217d88a07ded
name = Python-3.11.15.tgz
URL1 = https://www.python.org/ftp/python/3.11.15/$(name)
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)

if (SYSTEM_BOOST != YES)
Expand Down
1 change: 1 addition & 0 deletions main/python/makefile.mk
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ TARFILE_NAME=Python-$(PYVERSION)
TARFILE_MD5=57f84cbd92d478ceff55217d88a07ded
PATCH_FILES=\
python-md5.patch \
python-pyexpat.patch \
python-solver-before-std.patch \
python-$(PYVERSION)-sysbase.patch \
python-$(PYVERSION)-nohardlink.patch
Expand Down
6 changes: 5 additions & 1 deletion main/python/prj/d.lst
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,15 @@ mkdir: %_DEST%\lib%_EXT%\python\python3.11\config
..\%__SRC%\misc\build\Python-3.11.15\Makefile %_DEST%\lib%_EXT%\python\python3.11\config\Makefile
# TODO: _sysconfigdata filename is platform-mangled (e.g. _sysconfigdata__darwin_darwin.py on macOS,
# _sysconfigdata__linux_x86_64-linux-gnu.py on Linux). Verify exact name from built tree.
..\%__SRC%\misc\build\python-inst\lib\python3.11\_sysconfigdata*.py %_DEST%\lib%_EXT%\python\_sysconfigdata.py
..\%__SRC%\misc\build\python-inst\lib\python3.11\_sysconfigdata__darwin_darwin.py %_DEST%\lib%_EXT%\python\_sysconfigdata.py
..\%__SRC%\misc\build\python-inst\lib\python3.11\_sysconfigdata__linux_x86_64-linux-gnu.py %_DEST%\lib%_EXT%\python\_sysconfigdata.py
..\pyversion.mk %_DEST%\inc%_EXT%\pyversion.mk
..\pyversion_dmake.mk %_DEST%\inc%_EXT%\pyversion_dmake.mk

mkdir: %_DEST%\inc%_EXT%\python\cpython

..\%__SRC%\misc\build\Python-3.11.15\Include\* %_DEST%\inc%_EXT%\python\*
..\%__SRC%\misc\build\Python-3.11.15\Include\cpython\* %_DEST%\inc%_EXT%\python\cpython\*

#unix ONLY !
..\%__SRC%\misc\build\python-inst\bin\python %_DEST%\bin%_EXT%\python
Expand Down
11 changes: 11 additions & 0 deletions main/python/python-pyexpat.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
--- misc/Python-3.11.15/Modules/Setup 2026-03-03 01:52:57.000000000 +0100
+++ misc/build/Python-3.11.15/Modules/Setup 2026-07-04 12:51:02.908154677 +0200
@@ -159,7 +159,7 @@

# XML
#_elementtree _elementtree.c
-#pyexpat pyexpat.c
+pyexpat pyexpat.c

# hashing builtins
#_blake2 _blake2/blake2module.c _blake2/blake2b_impl.c _blake2/blake2s_impl.c