[Libreoffice-commits] .: 4 commits - config_host.mk.in configure.in desktop/source solenv/gbuild solenv/inc
Tor Lillqvist
tml at kemper.freedesktop.org
Fri Mar 2 05:43:09 PST 2012
config_host.mk.in | 1
configure.in | 32 ++++++++++++----
desktop/source/deployment/manager/dp_activepackages.cxx | 5 +-
solenv/gbuild/platform/IOS_ARM_GCC.mk | 2 -
solenv/gbuild/platform/com_GCC_defs.mk | 2 -
solenv/inc/unxgcc.mk | 5 ++
solenv/inc/unxiosr.mk | 5 ++
solenv/inc/unxmacx.mk | 5 ++
8 files changed, 42 insertions(+), 15 deletions(-)
New commits:
commit c70cedabd3da7f6af16af5f8784271d6398f4678
Author: Tor Lillqvist <tml at iki.fi>
Date: Fri Mar 2 14:21:36 2012 +0200
Clarify what --disable-extensions means
diff --git a/configure.in b/configure.in
index 6e51f35..958d4bc 100644
--- a/configure.in
+++ b/configure.in
@@ -393,6 +393,10 @@ AC_ARG_ENABLE(database-connectivity,
[Disable various database connectivity. Work in progress, use only if you are hacking on it.])
)
+# This doesn't mean not building (or "integrating") extensions
+# (although it probably should; i.e. it should imply
+# --disable-extension-integration I guess), it means not supporting
+# any extension mechanism at all
AC_ARG_ENABLE(extensions,
AS_HELP_STRING([--disable-extensions],
[Disable all add-on extension functionality. Work in progress, use only if you are hacking on it.])
commit ab9f4482b19126d696f5a004384ddf29f7fedbc3
Author: Tor Lillqvist <tml at iki.fi>
Date: Fri Mar 2 14:11:09 2012 +0200
Also bypass definitions of functions not used on Android or iOS
diff --git a/desktop/source/deployment/manager/dp_activepackages.cxx b/desktop/source/deployment/manager/dp_activepackages.cxx
index b7b99f5..5928662 100644
--- a/desktop/source/deployment/manager/dp_activepackages.cxx
+++ b/desktop/source/deployment/manager/dp_activepackages.cxx
@@ -52,13 +52,13 @@
// key: 0xFF UTF8(identifier)
// value: UTF8(tempname) 0xFF UTF8(filename) 0xFF UTF8(mediatype)
+#if !defined(ANDROID) && !defined(IOS)
+
namespace {
static char const separator = static_cast< char >(
static_cast< unsigned char >(0xFF));
-static char const legacyPrefix[] = "org.openoffice.legacy.";
-
::rtl::OString oldKey(::rtl::OUString const & fileName) {
return ::rtl::OUStringToOString(fileName, RTL_TEXTENCODING_UTF8);
}
@@ -119,6 +119,7 @@ static char const legacyPrefix[] = "org.openoffice.legacy.";
}
}
+#endif
namespace dp_manager {
commit fa65ff8b1d2f50fa7f14e92fa7bc3c5d6619831a
Author: Tor Lillqvist <tml at iki.fi>
Date: Fri Mar 2 14:07:25 2012 +0200
Check for Clang in configury and store and use result
diff --git a/config_host.mk.in b/config_host.mk.in
index 2eed3c1..f0ea883 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -42,6 +42,7 @@ export CDR_LIBS=@CDR_LIBS@
export CLASSPATH=@CLASSPATH@
export CL_X64=@CL_X64@
export COM=@COM@
+export COM_GCC_IS_CLANG=@COM_GCC_IS_CLANG@
export COMEX=@COMEX@
export COMMONS_CODEC_JAR=@COMMONS_CODEC_JAR@
export COMMONS_HTTPCLIENT_JAR=@COMMONS_HTTPCLIENT_JAR@
diff --git a/configure.in b/configure.in
index 3d3d7e9..6e51f35 100644
--- a/configure.in
+++ b/configure.in
@@ -2442,9 +2442,9 @@ if test "$_os" = "WINNT"; then
fi
dnl ===================================================================
-dnl Test the gcc version, 3 is OK
+dnl Test the gcc version
dnl ===================================================================
-if test \( "$_os" != "WINNT" -o "$WITH_MINGW" = "yes" \) -a "$GCC" = "yes"; then
+if test "$GCC" = "yes"; then
AC_MSG_CHECKING([the GNU C compiler version])
_gcc_version=`$CC -dumpversion`
_gcc_major=`echo $_gcc_version | $AWK -F. '{ print \$1 }'`
@@ -2465,10 +2465,27 @@ if test \( "$_os" != "WINNT" -o "$WITH_MINGW" = "yes" \) -a "$GCC" = "yes"; then
AC_MSG_RESULT([implicitly using CC=$CC])
fi
else
- AC_MSG_RESULT([checked (gcc $_gcc_version)])
+ AC_MSG_RESULT([gcc $_gcc_version])
fi
fi
+dnl ===================================================================
+dnl Is it actually Clang?
+dnl ===================================================================
+
+if test "$GCC" = "yes"; then
+ AC_MSG_CHECKING([whether GCC is actually Clang])
+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
+ #ifndef __clang__
+ you lose
+ #endif
+ int foo=42;
+ ]])],
+ [AC_MSG_RESULT([yes])
+ COM_GCC_IS_CLANG=TRUE],
+ [AC_MSG_RESULT([no])])
+fi
+AC_SUBST(COM_GCC_IS_CLANG)
#
# prefix C with ccache if needed
diff --git a/solenv/gbuild/platform/IOS_ARM_GCC.mk b/solenv/gbuild/platform/IOS_ARM_GCC.mk
index 03bae7b..3483213 100644
--- a/solenv/gbuild/platform/IOS_ARM_GCC.mk
+++ b/solenv/gbuild/platform/IOS_ARM_GCC.mk
@@ -69,7 +69,7 @@ gb_CXXFLAGS := \
# No idea if -malign-natural is needed, but macosx.mk uses it...
# Why it isn't used in gb_CFLAGS I have no idea.
# Anyway, Clang doesn't have this option.
-ifeq (,$(findstring /clang,$(CXX)))
+ifneq ($(COM_GCC_IS_CLANG),TRUE)
gb_CXXFLAGS += \
-malign-natural
endif
diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk
index b6aff7f..cf77063 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -121,7 +121,7 @@ gb_LinkTarget_EXCEPTIONFLAGS := \
-fexceptions
# Clang doesn't have this option
-ifeq (,$(findstring /clang,$(CXX)))
+ifneq ($(COM_GCC_IS_CLANG),TRUE)
gb_LinkTarget_EXCEPTIONFLAGS += \
-fno-enforce-eh-specs
endif
diff --git a/solenv/inc/unxgcc.mk b/solenv/inc/unxgcc.mk
index 14983dd..3765b2d 100644
--- a/solenv/inc/unxgcc.mk
+++ b/solenv/inc/unxgcc.mk
@@ -78,7 +78,10 @@ CFLAGSENABLESYMBOLS=-g
# flags for the C++ Compiler
CFLAGSCC= -pipe $(ARCH_FLAGS)
# Flags for enabling exception handling
-CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs
+CFLAGSEXCEPTIONS=-fexceptions
+.IF "$(COM_GCC_IS_CLANG)" != "TRUE"
+CFLAGSEXCEPTIONS+=-fno-enforce-eh-specs
+.ENDIF
# Flags for disabling exception handling
CFLAGS_NO_EXCEPTIONS=-fno-exceptions
diff --git a/solenv/inc/unxiosr.mk b/solenv/inc/unxiosr.mk
index 6ddb15a..6928b94 100644
--- a/solenv/inc/unxiosr.mk
+++ b/solenv/inc/unxiosr.mk
@@ -57,7 +57,10 @@ OBJCFLAGS=-fexceptions -fobjc-abi-version=2 -fobjc-legacy-dispatch -D__IPHONE_OS
OBJCXXFLAGS:=-x objective-c++ $(OBJCFLAGS)
# Comp Flags for files that need exceptions enabled (C and C++)
-CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs
+CFLAGSEXCEPTIONS=-fexceptions
+.IF "$(COM_GCC_IS_CLANG)" != "TRUE"
+CFLAGSEXCEPTIONS+=-fno-enforce-eh-specs
+.ENDIF
# Comp Flags for files that do not need exceptions enabled (C and C++)
CFLAGS_NO_EXCEPTIONS=-fno-exceptions
diff --git a/solenv/inc/unxmacx.mk b/solenv/inc/unxmacx.mk
index b0c862e..0cb0b62 100644
--- a/solenv/inc/unxmacx.mk
+++ b/solenv/inc/unxmacx.mk
@@ -103,7 +103,10 @@ OBJCFLAGS=-fobjc-exceptions
OBJCXXFLAGS=-x objective-c++ -fobjc-exceptions
# Comp Flags for files that need exceptions enabled (C and C++)
-CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs
+CFLAGSEXCEPTIONS=-fexceptions
+.IF "$(COM_GCC_IS_CLANG)" != "TRUE"
+CFLAGSEXCEPTIONS+=-fno-enforce-eh-specs
+.ENDIF
# Comp Flags for files that do not need exceptions enabled (C and C++)
CFLAGS_NO_EXCEPTIONS=-fno-exceptions
commit a871755e673fc83c92bf9731603d22004d0a3f2e
Author: Tor Lillqvist <tml at iki.fi>
Date: Fri Mar 2 13:26:45 2012 +0200
Reduce vertical whitespace a bit
diff --git a/configure.in b/configure.in
index eef6de4..3d3d7e9 100644
--- a/configure.in
+++ b/configure.in
@@ -2239,8 +2239,6 @@ if test "$_os" = "SunOS"; then
fi
-
-
dnl ===================================================================
dnl Test MacOSX sdk and version requirement
dnl ===================================================================
@@ -2479,7 +2477,6 @@ if test "$_os" != "WINNT" -o "$WITH_MINGW" = "yes" ; then
if test "$CCACHE" != "" ; then
AC_MSG_CHECKING([whether $CC is already ccached])
-
AC_LANG_PUSH([C])
save_CFLAGS=$CFLAGS
CFLAGS="$CFLAGS --ccache-skip -O2"
@@ -3333,7 +3330,6 @@ fi
AC_SUBST(ENABLE_CRASHDUMP)
-
dnl Set the ENABLE_WERROR variable. (Activate --enable-werror)
dnl ===================================================================
AC_MSG_CHECKING([whether to turn warnings to errors])
@@ -8620,7 +8616,6 @@ if test "$enable_ext_report_builder" != "no" -a "x$enable_extension_integration"
[AC_MSG_ERROR(libserializer.jar not found.)], [])
fi
-
if test -z $LIBBASE_JAR; then
AC_CHECK_FILE(/usr/share/java/libbase-1.0.0.jar,
[ LIBBASE_JAR=/usr/share/java/libbase-1.0.0.jar ],
More information about the Libreoffice-commits
mailing list