pyuno/CustomTarget_pyuno_pythonloader_ini.mk | 4 ++-- pyuno/zipcore/mac.sh | 2 +- pyuno/zipcore/nonmac.sh | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)
New commits: commit f775f6766aa6e0e916a6b32b599fd2a977779520 Author: Xisco Fauli <[email protected]> AuthorDate: Mon Jun 16 19:36:33 2025 +0200 Commit: Xisco Fauli <[email protected]> CommitDate: Mon Jun 16 21:19:55 2025 +0200 pyuno: no need to add lib-tk to path Change-Id: Ie86ba52ab2e8df66cabe75acaf440b2ca076f4c7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/186580 Tested-by: Jenkins Reviewed-by: Xisco Fauli <[email protected]> diff --git a/pyuno/CustomTarget_pyuno_pythonloader_ini.mk b/pyuno/CustomTarget_pyuno_pythonloader_ini.mk index 2db26d99f362..cd80aef18eca 100644 --- a/pyuno/CustomTarget_pyuno_pythonloader_ini.mk +++ b/pyuno/CustomTarget_pyuno_pythonloader_ini.mk @@ -28,10 +28,10 @@ $(gb_CustomTarget_workdir)/pyuno/pythonloader_ini/$(call gb_Helper_get_rcfile,py $(if $(SYSTEM_PYTHON), \ '', \ $(if $(filter MACOSX,$(OS)), \ - '$(foreach dir,/ /lib-dynload /lib-tk /site-packages,$(patsubst %/,%,$$ORIGIN/../Frameworks/LibreOfficePython.framework/Versions/Current/lib/python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)$(dir))) ', \ + '$(foreach dir,/ /lib-dynload /site-packages,$(patsubst %/,%,$$ORIGIN/../Frameworks/LibreOfficePython.framework/Versions/Current/lib/python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)$(dir))) ', \ $(if $(filter WNT,$(OS)), \ '$(foreach dir,/ /site-packages,$(patsubst %/,%,$$ORIGIN/python-core-$(PYTHON_VERSION)/lib$(dir))) ', \ - '$(foreach dir,/ /lib-dynload /lib-tk /site-packages,$(patsubst %/,%,$$ORIGIN/python-core-$(PYTHON_VERSION)/lib$(dir))) '))) \ + '$(foreach dir,/ /lib-dynload /site-packages,$(patsubst %/,%,$$ORIGIN/python-core-$(PYTHON_VERSION)/lib$(dir))) '))) \ ) > $@ $(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),ECH) diff --git a/pyuno/zipcore/mac.sh b/pyuno/zipcore/mac.sh index 830bcdaa10b2..0832279f8d82 100644 --- a/pyuno/zipcore/mac.sh +++ b/pyuno/zipcore/mac.sh @@ -7,7 +7,7 @@ PYTHONHOME=$sd_prog/../Frameworks/LibreOfficePython.framework export PYTHONHOME pybasislibdir=$PYTHONHOME/Versions/%%PYVERSION%%/lib/python%%PYVERSION%% -PYTHONPATH=$sd_prog/../Resources:$sd_prog/../Frameworks:$pybasislibdir:$pybasislibdir/lib-dynload:$pybasislibdir/lib-tk:$pybasislibdir/site-packages${PYTHONPATH+:$PYTHONPATH} +PYTHONPATH=$sd_prog/../Resources:$sd_prog/../Frameworks:$pybasislibdir:$pybasislibdir/lib-dynload:$pybasislibdir/site-packages${PYTHONPATH+:$PYTHONPATH} export PYTHONPATH # execute binary diff --git a/pyuno/zipcore/nonmac.sh b/pyuno/zipcore/nonmac.sh index 5e7cca14d063..037a0ead3c0d 100644 --- a/pyuno/zipcore/nonmac.sh +++ b/pyuno/zipcore/nonmac.sh @@ -3,7 +3,7 @@ : ${URE_BOOTSTRAP=vnd.sun.star.pathname:$sd_prog/fundamentalrc} export URE_BOOTSTRAP -PYTHONPATH=$sd_prog:$sd_prog/python-core-%%PYVERSION%%/lib:$sd_prog/python-core-%%PYVERSION%%/lib/lib-dynload:$sd_prog/python-core-%%PYVERSION%%/lib/lib-tk:$sd_prog/python-core-%%PYVERSION%%/lib/site-packages${PYTHONPATH+:$PYTHONPATH} +PYTHONPATH=$sd_prog:$sd_prog/python-core-%%PYVERSION%%/lib:$sd_prog/python-core-%%PYVERSION%%/lib/lib-dynload:$sd_prog/python-core-%%PYVERSION%%/lib/site-packages${PYTHONPATH+:$PYTHONPATH} export PYTHONPATH PYTHONHOME=$sd_prog/python-core-%%PYVERSION%% export PYTHONHOME
