RepositoryExternal.mk | 2 +- configure.ac | 15 ++++++++++----- 2 files changed, 11 insertions(+), 6 deletions(-)
New commits: commit 4999a73991e6995e8d307c7653bfbf29a15573ec Author: Stephan Bergmann <sberg...@redhat.com> Date: Wed Mar 19 11:24:57 2014 +0100 --enable-python=fully-internal to force PYTHON_FOR_BUILD= (for testing purposes, mainly) Change-Id: I50d3c92b9ac0cc9dda55b7340f657acb74f675f6 diff --git a/configure.ac b/configure.ac index f372fe03..89a8166 100644 --- a/configure.ac +++ b/configure.ac @@ -950,10 +950,11 @@ AC_ARG_ENABLE(crashdump, [Enable the crashdump feature.])) AC_ARG_ENABLE(python, - AS_HELP_STRING([--enable-python=<no/auto/system/internal>], + AS_HELP_STRING([--enable-python=<no/auto/system/internal/fully-internal>], [Enables or disables Python support at run-time and build-time. - Also specifies what Python to use. 'auto' is the - default.])) + Also specifies what Python to use. 'auto' is the default. + 'fully-internal' even forces the internal version for uses of Python + during the build (for testing purposes, mainly).])) AC_ARG_ENABLE(gtk, AS_HELP_STRING([--disable-gtk], @@ -7819,7 +7820,7 @@ AC_SUBST(XMLLINT) # Optionally user can pass an option to configure, i. e. # ./configure PYTHON=/usr/bin/python # ===================================================================== -if test "$build_os" != "cygwin"; then +if test "$build_os" != "cygwin" -a "$enable_python" != fully-internal; then # This allows a lack of system python with no error, we use internal one in that case. AM_PATH_PYTHON([2.5],, [:]) # Clean PYTHON_VERSION checked below if cross-compiling @@ -7854,7 +7855,7 @@ no|disable) dnl (When cross-compiling to Windows from Linux using the mingw32-cross dnl compiler from OBS, use mingw32-python from OBS, and ditto for other dnl MinGW cross-compilation setups.) - AC_MSG_RESULT([internal]) + AC_MSG_RESULT([fully internal]) enable_python=internal elif test "$cross_compiling" = yes; then AC_MSG_RESULT([system]) @@ -7876,6 +7877,10 @@ no|disable) internal) AC_MSG_RESULT([internal]) ;; +fully-internal) + AC_MSG_RESULT([fully internal]) + enable_python=internal + ;; system) AC_MSG_RESULT([system]) ;; commit 233610f1245685a3f27cf9633c93568bd1d300da Author: Stephan Bergmann <sberg...@redhat.com> Date: Wed Mar 19 11:24:13 2014 +0100 gbuild: More crude hacking to fix over-evaluation of gb_Python_PRECOMMAND ...in the spirit of 3e70e26cbc96667e2968cd325737053bf8bffb78 "gbuild: fix over- evaluation in gb_ExternalExecutable__set_internal" Change-Id: I3d5859bd3437cc050250e66d723d3dee3056ef46 diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index a1fbcda..809a110 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -3491,7 +3491,7 @@ $(call gb_ExternalExecutable_add_dependencies,python,$(call gb_GeneratedPackage_ else $(call gb_ExternalExecutable_set_internal,python,$(INSTROOT)/$(LIBO_BIN_FOLDER)/$(if $(filter WNT,$(OS)),python-core-$(PYTHON_VERSION)/bin/python.exe,python.bin)) -$(call gb_ExternalExecutable_set_precommand,python,$(gb_Python_PRECOMMAND)) +$(call gb_ExternalExecutable_set_precommand,python,$(subst $$,$$$$,$(gb_Python_PRECOMMAND))) $(call gb_ExternalExecutable_add_dependencies,python,$(call gb_Package_get_target_for_build,python3)) endif _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits