[Libreoffice-commits] .: 3 commits - idlc/source l10ntools/source solenv/gbuild solenv/inc

[Tor Lillqvist]

 idlc/source/wrap_scanner.cxx      |    6 ++++++
 l10ntools/source/cfg_yy_wrapper.c |    3 +++
 l10ntools/source/src_yy_wrapper.c |    3 +++
 l10ntools/source/xrm_yy_wrapper.c |    3 +++
 solenv/gbuild/platform/macosx.mk  |    2 +-
 solenv/inc/unxmacx.mk             |    4 ++++
 6 files changed, 20 insertions(+), 1 deletion(-)

New commits:
commit 8c1e9c7dfdc17b156931bbbe42851c08c7281be5
Author: Tor Lillqvist <tml at iki.fi>
Date:   Sun Apr 22 01:29:07 2012 +0300

    WaE: comparison of integers of different signs and unused functions

diff --git a/idlc/source/wrap_scanner.cxx b/idlc/source/wrap_scanner.cxx
index f058db1..94a068a 100644
--- a/idlc/source/wrap_scanner.cxx
+++ b/idlc/source/wrap_scanner.cxx
@@ -26,7 +26,13 @@
  *
  ************************************************************************/
 
+#ifdef __clang__
+#pragma clang diagnostic ignored "-Wsign-compare"
+#endif
 
 #include "scanner.cxx"
 
+void (*avoid_unused_yyunput_in_scanner_cxx)(int, char*) = yyunput;
+int (*avoid_unused_yyinput_in_scanner_cxx)() = yyinput;
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 1ac9f91198889cc5cee40ba9ef2b0255183ee195
Author: Tor Lillqvist <tml at iki.fi>
Date:   Sun Apr 22 00:59:45 2012 +0300

    WaE: unused functions

diff --git a/l10ntools/source/cfg_yy_wrapper.c b/l10ntools/source/cfg_yy_wrapper.c
index ecfb35b..b22d2a7 100644
--- a/l10ntools/source/cfg_yy_wrapper.c
+++ b/l10ntools/source/cfg_yy_wrapper.c
@@ -2,4 +2,7 @@
 // Helper to suppress warnings in lex generated c code, see #i57362#
 #include "cfg_yy.c"
 
+void (*avoid_unused_yyunput_in_cfg_yy_c)() = yyunput;
+int (*avoid_unused_yy_flex_strlen_in_cfg_yy_c)() = yy_flex_strlen;
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/l10ntools/source/src_yy_wrapper.c b/l10ntools/source/src_yy_wrapper.c
index 974068d..da9c17f 100644
--- a/l10ntools/source/src_yy_wrapper.c
+++ b/l10ntools/source/src_yy_wrapper.c
@@ -2,4 +2,7 @@
 // Helper to suppress warnings in lex generated c code, see #i57362#
 #include "src_yy.c"
 
+void (*avoid_unused_yyunput_in_src_yy_c)() = yyunput;
+int (*avoid_unused_yy_flex_strlen_in_src_yy_c)() = yy_flex_strlen;
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/l10ntools/source/xrm_yy_wrapper.c b/l10ntools/source/xrm_yy_wrapper.c
index 2724ad0..191d16f 100644
--- a/l10ntools/source/xrm_yy_wrapper.c
+++ b/l10ntools/source/xrm_yy_wrapper.c
@@ -2,4 +2,7 @@
 // Helper to suppress warnings in lex generated c code, see #i57362#
 #include "xrm_yy.c"
 
+void (*avoid_unused_yyunput_in_xrm_yy_c)() = yyunput;
+int (*avoid_unused_yy_flex_strlen_in_xrm_yy_c)() = yy_flex_strlen;
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 1bf04b934a8f51ac50be4cb9b6eacbb092871383
Author: Tor Lillqvist <tml at iki.fi>
Date:   Sun Apr 22 00:09:44 2012 +0300

    Don't use -Wl,-syslibroot when building against more current SDKs

diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index ab955cf..d4d113d 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -95,7 +95,7 @@ gb_OBJCXXFLAGS := -x objective-c++ -fobjc-exceptions
 gb_OBJCFLAGS := -x objective-c -fobjc-exceptions
 
 gb_LinkTarget_LDFLAGS := \
-	-Wl,-syslibroot,$(gb_SDKDIR) \
+	$(if $(filter 1040 1050,$(MAC_OS_X_VERSION_MIN_REQUIRED)),-Wl$(COMMA)-syslibroot$(COMMA)$(gb_SDKDIR)) \
 	$(subst -L../lib , ,$(SOLARLIB)) \
 #man ld says: obsolete	-Wl,-multiply_defined,suppress \
 
diff --git a/solenv/inc/unxmacx.mk b/solenv/inc/unxmacx.mk
index e402783..1ca6a82 100644
--- a/solenv/inc/unxmacx.mk
+++ b/solenv/inc/unxmacx.mk
@@ -178,8 +178,12 @@ LINK*=$(CXX)
 LINKC*=$(CC)
 
 LINKFLAGSDEFS*=-Wl,-multiply_defined,suppress
+
+.IF "$(MAC_OS_X_VERSION_MIN_REQUIRED)" <= "1050"
 # assure backwards-compatibility
 EXTRA_LINKFLAGS*:=-Wl,-syslibroot,$(MACOSX_SDK_PATH)
+.ENDIF
+
 # Very long install_names are needed so that install_name_tool -change later on
 # does not complain that "larger updated load commands do not fit:"
 LINKFLAGSRUNPATH_URELIB=-install_name '@__________________________________________________URELIB/$(@:f)'