diff options
| author | Michael Stahl <Michael.Stahl@cib.de> | 2020-04-06 14:33:15 +0200 |
|---|---|---|
| committer | Michael Stahl <michael.stahl@cib.de> | 2020-04-06 18:01:48 +0200 |
| commit | d3a136dfb73ab47e79ccd0fe83e0ac80512d9503 (patch) | |
| tree | 58be3ea9e0fd370d0fa3ef4c38cca242d7b92b75 | |
| parent | fec598900ffe7ee7c55313ef0e258fb43fb36ef7 (diff) | |
lxml: try to remove some quirky PYPATH stuff
In RepositoryExternal.mk, a system python automatically gets $PYPATH
added to $PYTHONPATH, but the internal one does not - this doesn't make
sense.
Try to remove it for system-case by fixing the one case that relies on
it and for which it was introduced in commit
84ef6d82546b044990f4efd57e51e29c6c6565c8 to directly extend $PYTHONPATH
instead, which ought to work as long as it's not evaluated at global
scope and thereby avoids affecting all python invocations.
Change-Id: I4534f2be92b850dc01193cb1bb2e0a299a5152be
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91748
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@cib.de>
| -rw-r--r-- | RepositoryExternal.mk | 1 | ||||
| -rw-r--r-- | external/lxml/ExternalProject_lxml.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/UIConfig.mk | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 7079e9bcf61b..9cba1af4cb40 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -4023,7 +4023,6 @@ else define gb_ExternalExecutable__register_python $(call gb_ExternalExecutable_set_external,python,$(PYTHON_FOR_BUILD)) -$(call gb_ExternalExecutable_set_precommand,python,PYTHONPATH=$$$$PYTHONPATH$$$${PYTHONPATH:+$$$${PYPATH:+:}}$$$$PYPATH) endef diff --git a/external/lxml/ExternalProject_lxml.mk b/external/lxml/ExternalProject_lxml.mk index 371db12e1c8d..a282546b1a11 100644 --- a/external/lxml/ExternalProject_lxml.mk +++ b/external/lxml/ExternalProject_lxml.mk @@ -24,7 +24,7 @@ $(call gb_ExternalProject_get_state_target,lxml,build): \ $(call gb_ExternalExecutable_get_dependencies,python) $(call gb_Trace_StartRange,lxml,EXTERNAL) $(call gb_ExternalProject_run,build,\ - PYPATH=$${PYPATH:+$$PYPATH:}$(call gb_UnpackedTarball_get_dir,lxml)/install && \ + export PYTHONPATH=$${PYTHONPATH:+$$PYTHONPATH:}$(call gb_UnpackedTarball_get_dir,lxml)/install && \ $(if $(PYTHON_FOR_BUILD), \ unset MACOSX_DEPLOYMENT_TARGET && , \ CFLAGS="$$CFLAGS -I$(call gb_UnpackedTarball_get_dir,python3)" && \ diff --git a/solenv/gbuild/UIConfig.mk b/solenv/gbuild/UIConfig.mk index 5b322fb6b0f5..eaca4c5d8da3 100644 --- a/solenv/gbuild/UIConfig.mk +++ b/solenv/gbuild/UIConfig.mk @@ -98,7 +98,7 @@ endef gb_UIConfig_INSTDIR := $(LIBO_SHARE_FOLDER)/config/soffice.cfg ifneq ($(filter LXML,$(BUILD_TYPE)),) -gb_UIConfig_LXML_PATH := PYPATH=$${PYPATH:+$$PYPATH:}$(call gb_UnpackedTarball_get_dir,lxml)/install ; +gb_UIConfig_LXML_PATH := PYTHONPATH=$${PYTHONPATH:+$$PYTHONPATH:}$(call gb_UnpackedTarball_get_dir,lxml)/install ; gb_UIConfig_LXML_TARGET := $(call gb_ExternalProject_get_target,lxml) endif gb_UIConfig_gla11y_SCRIPT := $(SRCDIR)/bin/gla11y |