configure.ac | 4 +++- python3/ExternalProject_python3.mk | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-)
New commits: commit b24f82fda9558a8b07a6df9ac898d0e166113a10 Author: Tor Lillqvist <[email protected]> Date: Wed Jan 2 20:53:59 2013 +0200 Can't build the NPAPI plugin stuff as 64-bit for OS X It uses QuickTime and Carbon. diff --git a/configure.ac b/configure.ac index f3e69ac..d5ed79d 100644 --- a/configure.ac +++ b/configure.ac @@ -8508,7 +8508,9 @@ dnl =================================================================== dnl Check for NPAPI interface to plug browser plugins into LibreOffice documents dnl =================================================================== AC_MSG_CHECKING([whether to plug browser plugins into LibreOffice documents]) -if test "$_os" != Android -a "$_os" != iOS +# Obviously no such thing on iOS or Android. Also not possible when building +# 64-bit OS X code as the plugin code uses QuickTime and Carbon. +if test "$_os" != Android -a "$_os" != iOS -a \( $_os != Darwin -o "$BITNESS_OVERRIDE" = "" \) then AC_MSG_RESULT([yes]) ENABLE_NPAPI_FROM_BROWSER=YES commit 0f6f38b5d7288dd71a26040aee04b1ca4f6e0bcf Author: Tor Lillqvist <[email protected]> Date: Wed Jan 2 17:51:37 2013 +0200 Fix 64-bit OS X build: don't try any universalness diff --git a/python3/ExternalProject_python3.mk b/python3/ExternalProject_python3.mk index e2ea53a..a2dbb09 100644 --- a/python3/ExternalProject_python3.mk +++ b/python3/ExternalProject_python3.mk @@ -74,7 +74,7 @@ $(call gb_ExternalProject_get_state_target,python3,build) : $(if $(filter AIX,$(OS)),--disable-ipv6 --with-threads) \ $(if $(filter WNT-GCC,$(OS)-$(COM)),--with-threads ac_cv_printf_zd_format=no) \ $(if $(filter MACOSX,$(OS)), \ - --enable-universalsdk=$(MACOSX_SDK_PATH) --with-universal-archs=32-bit --enable-framework=/@__________________________________________________OOO --with-framework-name=LibreOfficePython, \ + $(if $(filter INTEL POWERPC,$(CPUNAME)),--enable-universalsdk=$(MACOSX_SDK_PATH) --with-universal-archs=32-bit) --enable-framework=/@__________________________________________________OOO --with-framework-name=LibreOfficePython, \ --enable-shared \ ) \ CC="$(strip $(CC) \ _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
