external/python3/ExternalPackage_python3.mk | 6 +++++- external/python3/generateExternalPackage.py | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-)
New commits: commit dd8c42bf4b6eb5f692bb929547f69a9aedcf6c0c Author: Xisco Fauli <[email protected]> AuthorDate: Tue Sep 23 10:07:26 2025 +0200 Commit: Xisco Fauli <[email protected]> CommitDate: Tue Sep 23 11:21:40 2025 +0200 tdf#168511: python3: bundle venv Change-Id: I5d4b03571099486b981f83b0487cdcbc4dd7a1a7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/191377 Reviewed-by: Xisco Fauli <[email protected]> Tested-by: Jenkins diff --git a/external/python3/ExternalPackage_python3.mk b/external/python3/ExternalPackage_python3.mk index f9edcec4a404..b70477dc1944 100644 --- a/external/python3/ExternalPackage_python3.mk +++ b/external/python3/ExternalPackage_python3.mk @@ -177,7 +177,6 @@ endif # curses - need curses to build the C module # idlelib, tkinter, turtledemo - need Tk to build the C module # test - probably unnecessary? was explicitly removed #i116738# -# venv - why would we need virtual environments # # Call generateExternalPackage.py to update the lists below # @@ -1694,6 +1693,11 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/p Lib/urllib/robotparser.py \ )) +$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/venv,\ + Lib/venv/__init__.py \ + Lib/venv/__main__.py \ +)) + $(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/wsgiref,\ Lib/wsgiref/__init__.py \ Lib/wsgiref/handlers.py \ diff --git a/external/python3/generateExternalPackage.py b/external/python3/generateExternalPackage.py index 962c8f3a8130..b53a04e7f58a 100755 --- a/external/python3/generateExternalPackage.py +++ b/external/python3/generateExternalPackage.py @@ -10,7 +10,7 @@ from os import path, walk if __name__ == '__main__': - ignoredPackages = ["dbm", "curses", "test", "tkinter", "turtledemo", "sqlite3", "idlelib", "venv"] + ignoredPackages = ["dbm", "curses", "test", "tkinter", "turtledemo", "sqlite3", "idlelib"] coreDir = path.dirname(path.dirname(path.dirname(path.abspath(__file__)))) pythonDir = path.join(coreDir, "workdir/UnpackedTarball/python3")
