[PATCH] always use system python for building
Hello LibreOffice gerrit bot, I'd like you to reexamine a change. Please visit https://gerrit.libreoffice.org/2563 to look at the new patch set (#2). Change subject: always use system python for building .. always use system python for building We don't package perl, awk, sed, etc. to satisfy build dependency. So just in case we are using python as extension language for LO doesn't mean that we should use internal packaged python for building LO and fail back to it, even in the case if Pyuno is disabled. We stop with this silliness and always require Python interpreter with version = 2.7 to be installed. Note: once merged, all tinderboxes, that don't have system Python installed, have to be updated. Change-Id: I5c6c53fbee06cd1ecccf878a5c080274bfd950c1 --- M RepositoryExternal.mk M config_host.mk.in M configure.ac M nss/ExternalProject_nss.mk M solenv/gbuild/ExternalExecutable.mk 5 files changed, 27 insertions(+), 89 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/63/2563/2 -- To view, visit https://gerrit.libreoffice.org/2563 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: I5c6c53fbee06cd1ecccf878a5c080274bfd950c1 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Matúš Kukan matus.ku...@gmail.com Gerrit-Reviewer: David Ostrovsky david.ostrov...@gmx.de Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org Gerrit-Reviewer: Matúš Kukan matus.ku...@gmail.com Gerrit-Reviewer: Tomáš Chvátal tchva...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] always use system python for building
Hello LibreOffice gerrit bot, I'd like you to reexamine a rebased change. Please visit https://gerrit.libreoffice.org/2563 to look at the new rebased patch set (#3). Change subject: always use system python for building .. always use system python for building We don't package perl, awk, sed, etc. to satisfy build dependency. So just in case we are using python as extension language for LO doesn't mean that we should use internal packaged python for building LO and fail back to it, even in the case if Pyuno is disabled. We stop with this silliness and always require Python interpreter with version = 2.7 to be installed. Note: once merged, all tinderboxes, that don't have system Python installed, have to be updated. Change-Id: I5c6c53fbee06cd1ecccf878a5c080274bfd950c1 --- M RepositoryExternal.mk M config_host.mk.in M configure.ac M nss/ExternalProject_nss.mk M solenv/gbuild/ExternalExecutable.mk 5 files changed, 27 insertions(+), 89 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/63/2563/3 -- To view, visit https://gerrit.libreoffice.org/2563 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: I5c6c53fbee06cd1ecccf878a5c080274bfd950c1 Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Matúš Kukan matus.ku...@gmail.com Gerrit-Reviewer: David Ostrovsky david.ostrov...@gmx.de Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org Gerrit-Reviewer: Matúš Kukan matus.ku...@gmail.com Gerrit-Reviewer: Tomáš Chvátal tchva...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] always use system python for building
Hello LibreOffice gerrit bot, I'd like you to reexamine a change. Please visit https://gerrit.libreoffice.org/2563 to look at the new patch set (#4). Change subject: always use system python for building .. always use system python for building We don't package perl, awk, sed, etc. to satisfy build dependency. So just in case we are using python as extension language for LO doesn't mean that we should use internal packaged python for building LO and fail back to it, even in the case if Pyuno is disabled. We stop with this silliness and always require Python interpreter with version = 2.7 to be installed. Note: once merged, all tinderboxes, that don't have system Python installed, have to be updated. Change-Id: I5c6c53fbee06cd1ecccf878a5c080274bfd950c1 --- M RepositoryExternal.mk M config_host.mk.in M configure.ac M nss/ExternalProject_nss.mk M solenv/gbuild/ExternalExecutable.mk 5 files changed, 29 insertions(+), 89 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/63/2563/4 -- To view, visit https://gerrit.libreoffice.org/2563 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: I5c6c53fbee06cd1ecccf878a5c080274bfd950c1 Gerrit-PatchSet: 4 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Matúš Kukan matus.ku...@gmail.com Gerrit-Reviewer: David Ostrovsky david.ostrov...@gmx.de Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org Gerrit-Reviewer: Matúš Kukan matus.ku...@gmail.com Gerrit-Reviewer: Tomáš Chvátal tchva...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] always use system python for building
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/2563 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/63/2563/1 always use system python for building Change-Id: I5c6c53fbee06cd1ecccf878a5c080274bfd950c1 --- M RepositoryExternal.mk M config_host.mk.in M configure.ac M nss/ExternalProject_nss.mk M solenv/gbuild/ExternalExecutable.mk 5 files changed, 12 insertions(+), 85 deletions(-) diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 869e179..c63d909 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -2722,45 +2722,11 @@ endif # SYSTEM_UCPP -# TODO what do do with gb_PYTHON_PRECOMMAND? Move here? -ifeq ($(SYSTEM_PYTHON),YES) - +# Always use system python for building define gb_ExternalExecutable__register_python -$(call gb_ExternalExecutable_set_external,python,$(PYTHON)) +$(call gb_ExternalExecutable_set_external,python) endef - -else ifeq ($(OS),MACOSX) - -#fixme: remove this MACOSX ifeq branch by filling in gb_PYTHON_PRECOMMAND in -#gbuild/platform/macosx.mk correctly for mac, e.g. PYTHONPATH and PYTHONHOME -#dirs for in-tree internal python -define gb_ExternalExecutable__register_python -$(call gb_ExternalExecutable_set_external,python,$(PYTHON)) - -endef - -else ifeq ($(DISABLE_PYTHON),TRUE) - -# Build-time python -gb_ExternalExecutable__register_python := - -else # ! SYSTEM_PYTHON - -# internal python -define gb_ExternalExecutable__register_python -$(call gb_ExternalExecutable_set_internal,python) -$(call gb_ExternalExecutable_set_precommand,python,$(gb_PYTHON_PRECOMMAND)) -$(call gb_ExternalExecutable_add_dependencies,python,\ - $(if $(filter MACOSX,$(OS)) \ - ,$(call gb_Zip_get_outdir_target_for_build,LibreOfficePython.framework) \ - ,$(call gb_Package_get_target_for_build,python3) \ - ) \ -) - -endef - -endif # SYSTEM_PYTHON ifneq ($(SYSTEM_GENBRK),) diff --git a/config_host.mk.in b/config_host.mk.in index cd0fc37..2c511ef 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -468,9 +468,7 @@ export PSPRINT=TRUE export PTHREAD_CFLAGS=@PTHREAD_CFLAGS@ export PTHREAD_LIBS=@PTHREAD_LIBS@ -export PYTHON=@PYTHON@ export PYTHON_CFLAGS=$(gb_SPACE)@PYTHON_CFLAGS@ -export PYTHON_FOR_BUILD=@PYTHON_FOR_BUILD@ export PYTHON_LIBS=$(gb_SPACE)@PYTHON_LIBS@ export PYTHON_VERSION=@PYTHON_VERSION@ export PYTHON_VERSION_MAJOR=@PYTHON_VERSION_MAJOR@ diff --git a/configure.ac b/configure.ac index 7b04705..f80f866 100644 --- a/configure.ac +++ b/configure.ac @@ -4076,10 +4076,10 @@ cp config.log ../config.Build.log mkdir -p ../config_build cp config_host/*.h ../config_build -. ./bin/get_config_variables COM GUI OS PATH CPU CPUNAME CC CXX DISABLE_PYTHON MACOSX_DEPLOYMENT_TARGET INPATH OUTPATH PYTHON SYSTEM_LIBXSLT OUTDIR WORKDIR +. ./bin/get_config_variables COM GUI OS PATH CPU CPUNAME CC CXX MACOSX_DEPLOYMENT_TARGET INPATH OUTPATH SYSTEM_LIBXSLT OUTDIR WORKDIR -for V in COM GUI OS CPU CPUNAME CC CXX DISABLE_PYTHON MACOSX_DEPLOYMENT_TARGET INPATH OUTPATH \ - PYTHON SYSTEM_LIBXSLT; do +for V in COM GUI OS CPU CPUNAME CC CXX MACOSX_DEPLOYMENT_TARGET INPATH OUTPATH \ + SYSTEM_LIBXSLT; do VV='$'$V VV=`eval echo $VV` if test -n $VV; then @@ -4116,14 +4116,12 @@ CPUNAME_FOR_BUILD=$CPUNAME CPU_FOR_BUILD=$CPU CXX_FOR_BUILD=$CXX -DISABLE_PYTHON_FOR_BUILD=$DISABLE_PYTHON GUI_FOR_BUILD=$GUI INPATH_FOR_BUILD=$INPATH MACOSX_DEPLOYMENT_TARGET_FOR_BUILD=$MACOSX_DEPLOYMENT_TARGET OS_FOR_BUILD=$OS OUTDIR_FOR_BUILD=$OUTDIR OUTPATH_FOR_BUILD=$OUTPATH -PYTHON_FOR_BUILD=$PYTHON WORKDIR_FOR_BUILD=$WORKDIR fi AC_SUBST(COM_FOR_BUILD) @@ -4136,7 +4134,6 @@ AC_SUBST(INPATH_FOR_BUILD) AC_SUBST(OUTPATH_FOR_BUILD) AC_SUBST(MACOSX_DEPLOYMENT_TARGET_FOR_BUILD) -AC_SUBST([PYTHON_FOR_BUILD]) AC_SUBST(OUTDIR_FOR_BUILD) AC_SUBST(WORKDIR_FOR_BUILD) @@ -7282,21 +7279,13 @@ case $enable_python in no|disable) -if test $build_os = cygwin; then -# Python is required to build nss. In theory we could separate the build-time Python -# requirement from the choice whether to include Python stuff in the installer, but why -# bother? -AC_MSG_ERROR([Python is required at build time when building on Windows]) -fi enable_python=no AC_MSG_RESULT([none]) -DISABLE_PYTHON=TRUE ;; |yes|auto) if test $DISABLE_SCRIPTING = TRUE -a $build_os != cygwin; then AC_MSG_RESULT([no, overridden by --disable-scripting]) enable_python=no -DISABLE_PYTHON=TRUE elif test $build_os = cygwin; then dnl When building on Windows we don't attempt to use any installed dnl system Python. @@ -7330,8 +7319,6 @@ AC_MSG_ERROR([Incorrect --enable-python option]) ;; esac - -AC_SUBST(DISABLE_PYTHON) if test $_os = WINNT -a $WITH_MINGW != yes -a
