diff options
| author | Stephan Bergmann <stephan.bergmann@allotropia.de> | 2024-04-22 22:02:28 +0200 |
|---|---|---|
| committer | Stephan Bergmann <stephan.bergmann@allotropia.de> | 2024-04-23 11:32:51 +0200 |
| commit | 5d8e29c94edeed564df4b68aed01f695d5ece070 (patch) | |
| tree | 0c965f9a4abafb1dc6cc67bb5503b9780690b818 /external/icu/no-python.patch | |
| parent | 246ef0b8eaa86b62fb0f980d0736d97c05283266 (diff) | |
external/icu: Drop hidden dependency on Python
...which was always satisfied directly from the system, regardless of our
--enable-python=... setting. (And which was a problem for my Git Bash and WSL
based Windows build attempt, where it happened to find a dysfunctional Python
wrapper at C:/Users/steph/AppData/Local/Microsoft/WindowsApps/python3 which
caused a
[...]
> Not rebuilding data/rules.mk, assuming prebuilt data in data/in
> Spawning Python to generate test/testdata/rules.mk...
> Python was not found; run without arguments to install from the Microsoft Store, or disable this shortcut from Settings > Manage App Execution Aliases.
> configure: error: Python failed to run; see above error.
error when building ExternalProject_icu.)
There are three uses of that PYTHON setting across workdir/UnpackedTarget/icu:
1 In source/configure.ac to generate source/data/rules.mk if
source/data/locales/root.txt would exist---but which doesn't, so we don't
actually need PYTHON there.
2 In source/configure.ac to generate source/test/testdata/rules.mk, but which
our (non-check) build apparently doesn't need anyway.
3 In source/data/Makefile.in for target check-local, which is a sub-target of
check (which we don't build).
Change-Id: I7455cc91fc67f36582bf54851c07030830cd3b8d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166500
Reviewed-by: Stephan Bergmann <stephan.bergmann@allotropia.de>
Tested-by: Jenkins
Diffstat (limited to 'external/icu/no-python.patch')
| -rw-r--r-- | external/icu/no-python.patch | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/external/icu/no-python.patch b/external/icu/no-python.patch new file mode 100644 index 000000000000..33960fcae321 --- /dev/null +++ b/external/icu/no-python.patch @@ -0,0 +1,11 @@ +--- source/configure.ac ++++ source/configure.ac +@@ -202,7 +202,7 @@ + m4_ifndef([AX_CHECK_COMPILE_FLAG], [AC_MSG_ERROR(['autoconf-archive' is missing])]) + + # TODO(ICU-20301): Remove fallback to Python 2. +-AC_CHECK_PROGS(PYTHON, python3 "py -3" python "py") ++PYTHON= + AC_SUBST(PYTHON) + + # Check for the platform make |