From d3a136dfb73ab47e79ccd0fe83e0ac80512d9503 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Mon, 6 Apr 2020 14:33:15 +0200 Subject: 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 --- RepositoryExternal.mk | 1 - 1 file changed, 1 deletion(-) (limited to 'RepositoryExternal.mk') 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 -- cgit v1.2.3