RepositoryModule_build.mk | 1 - config_host.mk.in | 1 - configure.ac | 9 +-------- external/python3/ExternalProject_python3.mk | 8 -------- solenv/gbuild/extensions/pre_BuildTools.mk | 1 - 5 files changed, 1 insertion(+), 19 deletions(-)
New commits: commit e022e99557eb5fcdaf4909e1d3b0cb2e30454cb7 Author: Tor Lillqvist <[email protected]> AuthorDate: Mon Jan 26 16:35:45 2026 +0200 Commit: Tor Lillqvist <[email protected]> CommitDate: Mon Jan 26 18:25:48 2026 +0100 Revert "Fixes for Python cross-compilation, Linux to Linux at least" Nah, this is too complicated, and I am not interested enough. This reverts commit 942afbd4398d7a9fad0e1e65674c1ae59b538c2c. Change-Id: I436236e17cd3d2387b905a02c972b70e2456929d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/198153 Tested-by: Tor Lillqvist <[email protected]> Reviewed-by: Tor Lillqvist <[email protected]> diff --git a/RepositoryModule_build.mk b/RepositoryModule_build.mk index 9fc007d196ba..c39b65cf937d 100644 --- a/RepositoryModule_build.mk +++ b/RepositoryModule_build.mk @@ -37,7 +37,6 @@ $(eval $(call gb_Module_add_moduledirs,cross_toolset,\ officecfg \ oovbaapi \ pch \ - $(if $(filter PYTHON,$(BUILD_TYPE_FOR_HOST)),pyuno) \ registry \ remotebridges \ ridljar \ diff --git a/config_host.mk.in b/config_host.mk.in index 0ab05b76d9b7..2103814da8d0 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -728,7 +728,6 @@ SYSTEM_PAGEMAKER=@SYSTEM_PAGEMAKER@ SYSTEM_POPPLER=@SYSTEM_POPPLER@ SYSTEM_POSTGRESQL=@SYSTEM_POSTGRESQL@ SYSTEM_PYTHON=@SYSTEM_PYTHON@ -SYSTEM_PYTHON_FOR_BUILD=@SYSTEM_PYTHON_FOR_BUILD@ SYSTEM_ZXCVBN=@SYSTEM_ZXCVBN@ SYSTEM_ZXING=@SYSTEM_ZXING@ SYSTEM_QXP=@SYSTEM_QXP@ diff --git a/configure.ac b/configure.ac index 86734b701ded..01ec19398d7e 100644 --- a/configure.ac +++ b/configure.ac @@ -6410,7 +6410,6 @@ if test "$cross_compiling" = "yes"; then LIBO_URE_MISC_FOLDER OS SDKDIRNAME - SYSTEM_PYTHON SYSTEM_LIBXML SYSTEM_LIBXSLT " @@ -6497,7 +6496,6 @@ else LIBO_URE_MISC_FOLDER_FOR_BUILD="$LIBO_URE_MISC_FOLDER" SDKDIRNAME_FOR_BUILD="$SDKDIRNAME" WORKDIR_FOR_BUILD="$WORKDIR" - SYSTEM_PYTHON_FOR_BUILD="$SYSTEM_PYTHON" fi AC_SUBST(OS_FOR_BUILD) AC_SUBST(INSTDIR_FOR_BUILD) @@ -6511,7 +6509,6 @@ AC_SUBST(WORKDIR_FOR_BUILD) AC_SUBST(CC_FOR_BUILD) AC_SUBST(CXX_FOR_BUILD) AC_SUBST(CPPU_ENV_FOR_BUILD) -AC_SUBST(SYSTEM_PYTHON_FOR_BUILD) dnl =================================================================== dnl Check for lockfile deps @@ -10529,11 +10526,7 @@ if test "$build_os" != "cygwin" -a "$enable_python" != fully-internal; then # Clean PYTHON_VERSION checked below if cross-compiling PYTHON_VERSION="" if test "$PYTHON" != ":"; then - if test -n "$CROSS_COMPILING" -a -z "$SYSTEM_PYTHON_FOR_BUILD"; then - PYTHON_FOR_BUILD="$INSTDIR_FOR_BUILD/$LIBO_BIN_FOLDER_FOR_BUILD/python" - else - PYTHON_FOR_BUILD=$PYTHON - fi + PYTHON_FOR_BUILD=$PYTHON fi fi fi diff --git a/external/python3/ExternalProject_python3.mk b/external/python3/ExternalProject_python3.mk index 6d4d2cde81db..3c4860a85c46 100644 --- a/external/python3/ExternalProject_python3.mk +++ b/external/python3/ExternalProject_python3.mk @@ -94,16 +94,8 @@ $(call gb_ExternalProject_get_state_target,python3,build) : ac_cv_func_clock_gettime=no \ ) \ ) \ - $(if $(CROSS_COMPILING), \ - $(if $(filter LINUX,$(OS)), \ - ac_cv_buggy_getaddrinfo=no \ - ac_cv_file__dev_ptmx=yes \ - ac_cv_file__dev_ptc=yes \ - ) \ - ) \ $(gb_RUN_CONFIGURE) ./configure \ $(gb_CONFIGURE_PLATFORMS) \ - $(if $(CROSS_COMPILING),--with-build-python="$(PYTHON_FOR_BUILD)") \ $(if $(ENABLE_VALGRIND),--with-valgrind) \ $(if $(ENABLE_DBGUTIL),--with-pydebug) \ --prefix=/python-inst \ diff --git a/solenv/gbuild/extensions/pre_BuildTools.mk b/solenv/gbuild/extensions/pre_BuildTools.mk index 1eb8b2d03ad6..8ea180faa1b2 100644 --- a/solenv/gbuild/extensions/pre_BuildTools.mk +++ b/solenv/gbuild/extensions/pre_BuildTools.mk @@ -27,7 +27,6 @@ gb_BUILD_TOOLS_executables = \ $(call gb_CondExeLockfile,lockfile) \ makedepend \ propex \ - $(if $(filter PYTHON,$(BUILD_TYPE_FOR_HOST)),python) \ saxparser \ svidl \ treex \
