configure.in | 1 + solenv/gbuild/platform/macosx.mk | 5 +++++ 2 files changed, 6 insertions(+)
New commits: commit 122940aba7392bfba17b04a4c166b28ebbc3bd1f Author: Norbert Thiebaud <nthieb...@gmail.com> Date: Sat Dec 17 18:11:49 2011 -0600 do not package pything scripting extension when building --with-python=no diff --git a/configure.in b/configure.in index 1772116..40cf257 100644 --- a/configure.in +++ b/configure.in @@ -7690,6 +7690,7 @@ dnl Scripting provider for Python extension? dnl We always provide this unless we have disabled Python completely if test $enable_python = no; then ENABLE_SCRIPTING_PYTHON=NO + SCPDEFS="$SCPDEFS -DWITHOUT_EXTENSION_SCRIPTING_PYTHON" else ENABLE_SCRIPTING_PYTHON=YES fi commit 8c0242d3a9689ff1c75693bd506b276f8fca75b3 Author: Norbert Thiebaud <nthieb...@gmail.com> Date: Sat Dec 17 18:11:18 2011 -0600 do not run cppunit on Mac when cross-compiling diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk index 3c8329b..f1187cc 100644 --- a/solenv/gbuild/platform/macosx.mk +++ b/solenv/gbuild/platform/macosx.mk @@ -339,7 +339,12 @@ endef # CppunitTest class +ifeq ($(CROSS_COMPILING),YES) +gb_CppunitTest_CPPTESTPRECOMMAND := : +else gb_CppunitTest_CPPTESTPRECOMMAND := $(gb_Helper_set_ld_path) +endif + gb_CppunitTest_SYSPRE := libtest_ gb_CppunitTest_EXT := .dylib gb_CppunitTest_LIBDIR := $(gb_Helper_OUTDIRLIBDIR) _______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits