[Libreoffice-commits] core.git: config_host.mk.in configure.ac solenv/gbuild

[Luboš Luňák (via logerrit)]

 config_host.mk.in  |2 -
 configure.ac   |   47 +
 solenv/gbuild/platform/com_GCC_defs.mk |4 +-
 3 files changed, 39 insertions(+), 14 deletions(-)

New commits:
commit d235f705b4dda23cfd7b77c500b166016633e46c
Author: Luboš Luňák 
AuthorDate: Wed May 25 17:07:17 2022 +0200
Commit: Luboš Luňák 
CommitDate: Thu May 26 07:55:50 2022 +0200

use at least assertions mode if libc++ debug mode is not usable

This way at least e.g. std::vector::operator[] will still check
bounds even though things like iterator debugging will not work.

Change-Id: If3c550cfec68eee9a19050fc8e60fca07148b4a4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134946
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 

diff --git a/config_host.mk.in b/config_host.mk.in
index 9a2cd1343a18..019e1a65561b 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -306,7 +306,6 @@ export HAVE_GNUMAKE_FILE_FUNC=@HAVE_GNUMAKE_FILE_FUNC@
 export HAVE_LD_BSYMBOLIC_FUNCTIONS=@HAVE_LD_BSYMBOLIC_FUNCTIONS@
 export HAVE_LD_HASH_STYLE=@HAVE_LD_HASH_STYLE@
 export HAVE_LIBCPP=@HAVE_LIBCPP@
-export HAVE_LIBCPP_DEBUG=@HAVE_LIBCPP_DEBUG@
 export HAVE_LIBSTDCPP=@HAVE_LIBSTDCPP@
 export HAVE_POSIX_FALLOCATE=@HAVE_POSIX_FALLOCATE@
 export HAVE_WDEPRECATED_COPY_DTOR=@HAVE_WDEPRECATED_COPY_DTOR@
@@ -371,6 +370,7 @@ export LFS_CFLAGS=@LFS_CFLAGS@
 export LIBASSUAN_CFLAGS=$(gb_SPACE)@LIBASSUAN_CFLAGS@
 export LIBASSUAN_LIBS=$(gb_SPACE)@LIBASSUAN_LIBS@
 export LIBBASE_JAR=@LIBBASE_JAR@
+export LIBCPP_DEBUG=@LIBCPP_DEBUG@
 export LIBDIR=@LIBDIR@
 export LIBEOT_CFLAGS=$(gb_SPACE)@LIBEOT_CFLAGS@
 export LIBEOT_LIBS=$(gb_SPACE)@LIBEOT_LIBS@
diff --git a/configure.ac b/configure.ac
index bd9a1c3f8be6..d4cbd2410e0f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7423,33 +7423,58 @@ AC_LANG_POP([C++])
 AC_SUBST([HAVE_LIBSTDCPP])
 AC_SUBST([HAVE_LIBCPP])
 
-HAVE_LIBCPP_DEBUG=
+LIBCPP_DEBUG=
 if test -z "$CROSS_COMPILING" -a -n "$HAVE_LIBCPP" -a -n "$ENABLE_DBGUTIL"; 
then
-# Libc++ supports debug mode only if built for it, Mac libc++ isn't,
+# Libc++ has two levels of debug mode, assertions mode enabled with 
-D_LIBCPP_DEBUG=0,
+# and actual debug mode enabled with -D_LIBCPP_DEBUG=1 (and starting with 
LLVM15
+# assertions mode will be separate and controlled by 
-D_LIBCPP_ENABLE_ASSERTIONS=1,
+# although there will be backwards compatibility).
+# Debug mode is supported by libc++ only if built for it, e.g. Mac libc++ 
isn't,
 # and there would be undefined references to debug functions.
 # Moreover std::to_string() has a bug (https://reviews.llvm.org/D125184).
+# So check if debug mode can be used and disable or downgrade it to 
assertions
+# if needed.
 AC_MSG_CHECKING([if libc++ has a usable debug mode])
 AC_LANG_PUSH([C++])
-AC_RUN_IFELSE([AC_LANG_SOURCE([[
-#define _LIBCPP_DEBUG 1
+libcpp_debug_links=
+AC_LINK_IFELSE([AC_LANG_SOURCE([[
+#define _LIBCPP_DEBUG 0 // only assertions
+#include 
+int main()
+{
+std::vector v;
+v.push_back( 1 );
+return v[ 3 ];
+}
+]])], [libcpp_debug_links=1])
+if test -n "$libcpp_debug_links"; then
+# we can use at least assertions, check if debug mode works
+AC_RUN_IFELSE([AC_LANG_SOURCE([[
+#define _LIBCPP_DEBUG 1 // debug mode
 #include 
 #include 
 int foo(const std::vector& v) { return *v.begin(); }
 int main()
 {
-std::vector v{ 1, 2 };
+std::vector v;
+v.push_back( 1 );
 std::string s = "x" + std::to_string(10);
 return (foo(v) + s.size()) != 0 ? 0 : 1;
 }
 ]])],
-[AC_MSG_RESULT(yes)
- HAVE_LIBCPP_DEBUG=1
-],
-[AC_MSG_RESULT(no)]
-)
+[AC_MSG_RESULT(yes)
+ LIBCPP_DEBUG=-D_LIBCPP_DEBUG=1
+],
+[AC_MSG_RESULT(no, using only assertions)
+ LIBCPP_DEBUG=-D_LIBCPP_DEBUG=0
+]
+)
+else
+AC_MSG_RESULT(no)
+fi
 AC_LANG_POP([C++])
 fi
-AC_SUBST([HAVE_LIBCPP_DEBUG])
+AC_SUBST([LIBCPP_DEBUG])
 
 dnl ===
 dnl Check for gperf
diff --git a/solenv/gbuild/platform/com_GCC_defs.mk 
b/solenv/gbuild/platform/com_GCC_defs.mk
index c2db27243457..f16eb8ec282c 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -54,8 +54,8 @@ ifeq ($(gb_ENABLE_DBGUTIL),$(true))
 ifneq ($(HAVE_LIBSTDCPP),)
 gb_COMPILERDEFS_STDLIB_DEBUG = -D_GLIBCXX_DEBUG
 else
-ifneq ($(HAVE_LIBCPP_DEBUG),)
-gb_COMPILERDEFS_STDLIB_DEBUG = -D_LIBCPP_DEBUG=1
+ifneq ($(LIBCPP_DEBUG),)
+gb_COMPILERDEFS_STDLIB_DEBUG = $(LIBCPP_DEBUG)
 endif
 endif
 gb_COMPILERDEFS += $(gb_COMPILERDEFS_STDLIB_DEBUG)

[Libreoffice-commits] core.git: config_host.mk.in configure.ac solenv/gbuild

[Luboš Luňák (via logerrit)]

 config_host.mk.in  |1 +
 configure.ac   |   28 
 solenv/gbuild/platform/com_GCC_defs.mk |4 
 3 files changed, 33 insertions(+)

New commits:
commit 392f87b099509d0c0f5e553ae1c5970dca9dc235
Author: Luboš Luňák 
AuthorDate: Sat May 14 15:45:45 2022 +0200
Commit: Luboš Luňák 
CommitDate: Mon May 16 09:05:13 2022 +0200

enable libc++ debug mode again if available

Now includes a configure check for the std::to_string() crash.

Change-Id: I45c3b804b7a1ff5f6520f7bdf772497f72ddee47
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134338
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 

diff --git a/config_host.mk.in b/config_host.mk.in
index 4d1a98967551..df8205e8ad1d 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -305,6 +305,7 @@ export HAVE_GNUMAKE_FILE_FUNC=@HAVE_GNUMAKE_FILE_FUNC@
 export HAVE_LD_BSYMBOLIC_FUNCTIONS=@HAVE_LD_BSYMBOLIC_FUNCTIONS@
 export HAVE_LD_HASH_STYLE=@HAVE_LD_HASH_STYLE@
 export HAVE_LIBCPP=@HAVE_LIBCPP@
+export HAVE_LIBCPP_DEBUG=@HAVE_LIBCPP_DEBUG@
 export HAVE_LIBSTDCPP=@HAVE_LIBSTDCPP@
 export HAVE_POSIX_FALLOCATE=@HAVE_POSIX_FALLOCATE@
 export HAVE_WDEPRECATED_COPY_DTOR=@HAVE_WDEPRECATED_COPY_DTOR@
diff --git a/configure.ac b/configure.ac
index 2c65a1200f69..2f0f5a574ed6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7419,6 +7419,34 @@ AC_LANG_POP([C++])
 AC_SUBST([HAVE_LIBSTDCPP])
 AC_SUBST([HAVE_LIBCPP])
 
+HAVE_LIBCPP_DEBUG=
+if test -n "$HAVE_LIBCPP" -a -n "$ENABLE_DBGUTIL"; then
+# Libc++ supports debug mode only if built for it, Mac libc++ isn't,
+# and there would be undefined references to debug functions.
+# Moreover std::to_string() has a bug (https://reviews.llvm.org/D125184).
+AC_MSG_CHECKING([if libc++ has a usable debug mode])
+AC_LANG_PUSH([C++])
+AC_RUN_IFELSE([AC_LANG_SOURCE([[
+#define _LIBCPP_DEBUG 1
+#include 
+#include 
+int foo(const std::vector& v) { return *v.begin(); }
+int main()
+{
+std::vector v{ 1, 2 };
+std::string s = "x" + std::to_string(10);
+return (foo(v) + s.size()) != 0 ? 0 : 1;
+}
+]])],
+[AC_MSG_RESULT(yes)
+ HAVE_LIBCPP_DEBUG=1
+],
+[AC_MSG_RESULT(no)]
+)
+AC_LANG_POP([C++])
+fi
+AC_SUBST([HAVE_LIBCPP_DEBUG])
+
 dnl ===
 dnl Check for gperf
 dnl ===
diff --git a/solenv/gbuild/platform/com_GCC_defs.mk 
b/solenv/gbuild/platform/com_GCC_defs.mk
index c7cc1c3ef577..c2db27243457 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -53,6 +53,10 @@ gb_COMPILERDEFS := \
 ifeq ($(gb_ENABLE_DBGUTIL),$(true))
 ifneq ($(HAVE_LIBSTDCPP),)
 gb_COMPILERDEFS_STDLIB_DEBUG = -D_GLIBCXX_DEBUG
+else
+ifneq ($(HAVE_LIBCPP_DEBUG),)
+gb_COMPILERDEFS_STDLIB_DEBUG = -D_LIBCPP_DEBUG=1
+endif
 endif
 gb_COMPILERDEFS += $(gb_COMPILERDEFS_STDLIB_DEBUG)
 endif

[Libreoffice-commits] core.git: config_host.mk.in configure.ac solenv/gbuild

[Luboš Luňák (via logerrit)]

 config_host.mk.in  |1 -
 configure.ac   |   20 
 solenv/gbuild/platform/com_GCC_defs.mk |4 
 3 files changed, 25 deletions(-)

New commits:
commit c0f9157cf64242adbc4a9eb7cfac66fffa97e5a2
Author: Luboš Luňák 
AuthorDate: Sun May 8 14:52:10 2022 +0200
Commit: Luboš Luňák 
CommitDate: Mon May 9 09:13:41 2022 +0200

remove HAVE_LIBCPP_DEBUG (libc++ debug mode)

It's currently too broken (https://reviews.llvm.org/D125184),
but they're working on fixing it, so hopefully somewhen later.

Change-Id: I3ca243a57d41bd9d8c4cdbdc4a6a3b5fdc49e4c6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134023
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 

diff --git a/config_host.mk.in b/config_host.mk.in
index df8205e8ad1d..4d1a98967551 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -305,7 +305,6 @@ export HAVE_GNUMAKE_FILE_FUNC=@HAVE_GNUMAKE_FILE_FUNC@
 export HAVE_LD_BSYMBOLIC_FUNCTIONS=@HAVE_LD_BSYMBOLIC_FUNCTIONS@
 export HAVE_LD_HASH_STYLE=@HAVE_LD_HASH_STYLE@
 export HAVE_LIBCPP=@HAVE_LIBCPP@
-export HAVE_LIBCPP_DEBUG=@HAVE_LIBCPP_DEBUG@
 export HAVE_LIBSTDCPP=@HAVE_LIBSTDCPP@
 export HAVE_POSIX_FALLOCATE=@HAVE_POSIX_FALLOCATE@
 export HAVE_WDEPRECATED_COPY_DTOR=@HAVE_WDEPRECATED_COPY_DTOR@
diff --git a/configure.ac b/configure.ac
index ff4aa9cd1c8b..80058aaafb4c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7419,26 +7419,6 @@ AC_LANG_POP([C++])
 AC_SUBST([HAVE_LIBSTDCPP])
 AC_SUBST([HAVE_LIBCPP])
 
-HAVE_LIBCPP_DEBUG=
-if test -n "$HAVE_LIBCPP" -a -n "$ENABLE_DBGUTIL"; then
-# libc++ supports debug mode only if built for it, Mac libc++ isn't,
-# and there would be undefined references to debug functions
-AC_MSG_CHECKING([if libc++ is built with debug mode])
-AC_LANG_PUSH([C++])
-AC_LINK_IFELSE([AC_LANG_PROGRAM([[
-#define _LIBCPP_DEBUG 1
-#include 
-int foo(const std::vector& v) { return *v.begin(); }
-]])],
-[AC_MSG_RESULT(yes)
- HAVE_LIBCPP_DEBUG=1
-],
-[AC_MSG_RESULT(no)]
-)
-AC_LANG_POP([C++])
-fi
-AC_SUBST([HAVE_LIBCPP_DEBUG])
-
 dnl ===
 dnl Check for gperf
 dnl ===
diff --git a/solenv/gbuild/platform/com_GCC_defs.mk 
b/solenv/gbuild/platform/com_GCC_defs.mk
index c2db27243457..c7cc1c3ef577 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -53,10 +53,6 @@ gb_COMPILERDEFS := \
 ifeq ($(gb_ENABLE_DBGUTIL),$(true))
 ifneq ($(HAVE_LIBSTDCPP),)
 gb_COMPILERDEFS_STDLIB_DEBUG = -D_GLIBCXX_DEBUG
-else
-ifneq ($(HAVE_LIBCPP_DEBUG),)
-gb_COMPILERDEFS_STDLIB_DEBUG = -D_LIBCPP_DEBUG=1
-endif
 endif
 gb_COMPILERDEFS += $(gb_COMPILERDEFS_STDLIB_DEBUG)
 endif

[Libreoffice-commits] core.git: config_host.mk.in configure.ac solenv/gbuild

[Noel Grandin (via logerrit)]

 config_host.mk.in|1 -
 configure.ac |3 +--
 solenv/gbuild/ComponentTarget.mk |   26 +-
 solenv/gbuild/UnpackedTarball.mk |2 +-
 4 files changed, 7 insertions(+), 25 deletions(-)

New commits:
commit 224369b351884e8315368cfc99620c42eb97ee15
Author: Noel Grandin 
AuthorDate: Tue Feb 15 11:08:15 2022 +0200
Commit: Noel Grandin 
CommitDate: Tue Feb 15 11:19:43 2022 +0100

revert component name changes to makefile

This reverts
commit 2483cd198b51bd5d0819cbebf40f211b2ef1236d
Author: Jan-Marek Glogowski 
Date:   Fri Feb 11 19:40:36 2022 +0100
Correctly depend on source component file
and
commit 17ec55c48082254e1f55bcfa00808e45a50a9801
Author: Jan-Marek Glogowski 
Date:   Thu Jan 20 10:06:54 2022 +0100
Fail on non-optional, but filtered component names

because they cause failures on Windows builds that look
like:
warning: failed to load external entity 
"C:/cygwin/home/tdf/lode/jenkins/workspace/gerrit_windows@2/workdir/ComponentTarget/binaryurp/source/binaryurp.component"
cannot process 
C:/cygwin/home/tdf/lode/jenkins/workspace/gerrit_windows@2/workdir/ComponentTarget/binaryurp/source/binaryurp.component

Change-Id: Ia34cdabd76b47a6a4686ebd0f96ceb774d3236f2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129956
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/config_host.mk.in b/config_host.mk.in
index 3aee8c0f84bb..dee4375023fc 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -124,7 +124,6 @@ export DCONF_CFLAGS=@DCONF_CFLAGS@
 export DCONF_LIBS=@DCONF_LIBS@
 export DEFAULT_BRAND_IMAGES=@DEFAULT_BRAND_IMAGES@
 export DICT_SYSTEM_DIR=@DICT_SYSTEM_DIR@
-export DIFF=@DIFF@
 export DISABLE_CVE_TESTS=@DISABLE_CVE_TESTS@
 export DISABLE_DYNLOADING=@DISABLE_DYNLOADING@
 export DISABLE_PYTHON=@DISABLE_PYTHON@
diff --git a/configure.ac b/configure.ac
index f48477c64168..6acb3107cea3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11384,7 +11384,6 @@ AC_SUBST([UNIQ])
 dnl ***
 dnl Checking for patch
 dnl ***
-
 AC_PATH_PROG(PATCH, patch)
 if test -z "$PATCH"; then
 AC_MSG_ERROR(["patch" not found in \$PATH, install it])
@@ -11415,7 +11414,6 @@ fi
 if test "$GNUMAKE_WIN_NATIVE" = "TRUE" ; then
 GNUPATCH=`cygpath -m $GNUPATCH`
 fi
-AC_SUBST(GNUPATCH)
 
 dnl We also need to check for --with-gnu-cp
 
@@ -11459,6 +11457,7 @@ else
 esac
 fi
 
+AC_SUBST(GNUPATCH)
 AC_SUBST(GNUCP)
 AC_SUBST(x_GNUCP)
 
diff --git a/solenv/gbuild/ComponentTarget.mk b/solenv/gbuild/ComponentTarget.mk
index 3ba9cdb00d6b..d317f1b05ae7 100644
--- a/solenv/gbuild/ComponentTarget.mk
+++ b/solenv/gbuild/ComponentTarget.mk
@@ -49,7 +49,6 @@ endef
 $(call gb_ComponentTarget_get_clean_target,%) :
$(call gb_Output_announce,$*,$(false),CMP,1)
rm -f $(call gb_ComponentTarget_get_target,$*) \
-   $(call gb_ComponentTarget_get_target,$*).allfiltered \
$(call gb_ComponentTarget_get_target,$*).filtered \
$(call gb_ComponentTarget_get_target,$*).optionals \
 
@@ -62,21 +61,12 @@ $(call gb_ComponentTarget_get_target,%).optionals : \
| $(call gb_ComponentTarget_get_target,%).dir \
  $(call gb_ExternalExecutable_get_dependencies,xsltproc)
$(call gb_ExternalExecutable_get_command,xsltproc) --nonet \
-   $(gb_ComponentTarget_XSLT_DUMP_OPTIONALS) $(COMPONENTSOURCE) 2>&1 | 
LC_ALL=C $(SORT) > $@
+   $(gb_ComponentTarget_XSLT_DUMP_OPTIONALS) $(COMPONENTSOURCE) > $@ 
2>&1
 
 # %.filtered : list of all optional implementations we don't build
 .PRECIOUS: $(call gb_ComponentTarget_get_target,%).filtered
 $(call gb_ComponentTarget_get_target,%).filtered : $(call 
gb_ComponentTarget_get_target,%).optionals
-   cat $< $(COMPONENTIMPL) | sed -e '/^#/d' -e '/^[]*$$/d' | 
LC_ALL=C $(SORT) | $(UNIQ) -u > $@
-
-# %.allfiltered : contains all possible filtered components, which must match 
%.optionals
-.PRECIOUS: $(call gb_ComponentTarget_get_target,%).allfiltered
-$(call gb_ComponentTarget_get_target,%).allfiltered : $(call 
gb_ComponentTarget_get_target,%).optionals
-   $(if $(ALLFILTEREDIMPL), \
-   cat $(ALLFILTEREDIMPL) | sed -e '/^#/d' -e '/^[ ]*$$/d' | 
LC_ALL=C $(SORT) -u > $@.tmp, \
-   touch $@.tmp)
-   $(DIFF) -u $< $@.tmp
-   mv $@.tmp $@
+   cat $< $(COMPONENTIMPL) | sed -e '/^#\|^\s*$$/d' | sort | uniq -u > $@
 
 # when a library is renamed, the component file needs to be rebuilt to match.
 # hence simply depend on Repository{,Fixes}.mk since the command runs quickly.
@@ -84,7 +74,6 @@ $(call gb_ComponentTarget_get_target,%) : \
$(SRCDIR)/Repository.mk \
$(SRCDIR)/RepositoryFixes.mk \
$(gb_ComponentTarget_XSLT_CREATE_COMPONENT) \
-   $(call 

[Libreoffice-commits] core.git: config_host.mk.in configure.ac solenv/gbuild

[Jan-Marek Glogowski (via logerrit)]

 config_host.mk.in|1 +
 configure.ac |6 ++
 solenv/gbuild/ComponentTarget.mk |6 +++---
 3 files changed, 10 insertions(+), 3 deletions(-)

New commits:
commit 1ad8c5066bdb6ea825ad09d2a6c7f633b974fc69
Author: Jan-Marek Glogowski 
AuthorDate: Thu Jan 20 16:09:38 2022 +0100
Commit: Jan-Marek Glogowski 
CommitDate: Thu Jan 20 18:37:08 2022 +0100

Sorting component implementations needs LC_ALL=C

Change-Id: Ifba53b95fdefed59123a2e682e787119b6c67857
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128689
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski 

diff --git a/config_host.mk.in b/config_host.mk.in
index 9a0388fa0d35..193406c8fbc9 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -685,6 +685,7 @@ export TOUCH=@TOUCH@
 export UCRTSDKDIR=@UCRTSDKDIR@
 export UCRTVERSION=@UCRTVERSION@
 export UCRT_REDISTDIR=@UCRT_REDISTDIR@
+export UNIQ=@UNIQ@
 export UNIX_DLAPI_LIBS=@UNIX_DLAPI_LIBS@
 export USE_HEADLESS_CODE=@USE_HEADLESS_CODE@
 export USE_LD=@USE_LD@
diff --git a/configure.ac b/configure.ac
index 751ad1ebb872..53b2323a2c09 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11415,6 +11415,12 @@ if test -z "$DIFF"; then
 fi
 AC_SUBST([DIFF])
 
+AC_PATH_PROG(UNIQ, uniq)
+if test -z "$UNIQ"; then
+AC_MSG_ERROR(["uniq" not found in \$PATH, install it])
+fi
+AC_SUBST([UNIQ])
+
 dnl ***
 dnl Checking for patch
 dnl ***
diff --git a/solenv/gbuild/ComponentTarget.mk b/solenv/gbuild/ComponentTarget.mk
index ce0224433661..aed3fd88e889 100644
--- a/solenv/gbuild/ComponentTarget.mk
+++ b/solenv/gbuild/ComponentTarget.mk
@@ -62,18 +62,18 @@ $(call gb_ComponentTarget_get_target,%).optionals : \
| $(call gb_ComponentTarget_get_target,%).dir \
  $(call gb_ExternalExecutable_get_dependencies,xsltproc)
$(call gb_ExternalExecutable_get_command,xsltproc) --nonet \
-   $(gb_ComponentTarget_XSLT_DUMP_OPTIONALS) $(COMPONENTSOURCE) 2>&1 | 
sort > $@
+   $(gb_ComponentTarget_XSLT_DUMP_OPTIONALS) $(COMPONENTSOURCE) 2>&1 | 
LC_ALL=C $(SORT) > $@
 
 # %.filtered : list of all optional implementations we don't build
 .PRECIOUS: $(call gb_ComponentTarget_get_target,%).filtered
 $(call gb_ComponentTarget_get_target,%).filtered : $(call 
gb_ComponentTarget_get_target,%).optionals
-   cat $< $(COMPONENTIMPL) | sed -e '/^#/d' -e '/^[]*$$/d' | sort 
| uniq -u > $@
+   cat $< $(COMPONENTIMPL) | sed -e '/^#/d' -e '/^[]*$$/d' | 
LC_ALL=C $(SORT) | $(UNIQ) -u > $@
 
 # %.allfiltered : contains all possible filtered components, which must match 
%.optionals
 .PRECIOUS: $(call gb_ComponentTarget_get_target,%).allfiltered
 $(call gb_ComponentTarget_get_target,%).allfiltered : $(call 
gb_ComponentTarget_get_target,%).optionals
$(if $(ALLFILTEREDIMPL), \
-   cat $(ALLFILTEREDIMPL) | sed -e '/^#/d' -e '/^[ ]*$$/d' | sort 
| uniq > $@.tmp, \
+   cat $(ALLFILTEREDIMPL) | sed -e '/^#/d' -e '/^[ ]*$$/d' | 
LC_ALL=C $(SORT) -u > $@.tmp, \
touch $@.tmp)
$(DIFF) -u $< $@.tmp
mv $@.tmp $@

[Libreoffice-commits] core.git: config_host.mk.in configure.ac solenv/gbuild

[Jan-Marek Glogowski (via logerrit)]

 config_host.mk.in|1 +
 configure.ac |   10 +-
 solenv/gbuild/ComponentTarget.mk |   26 +-
 solenv/gbuild/UnpackedTarball.mk |2 +-
 4 files changed, 32 insertions(+), 7 deletions(-)

New commits:
commit 17ec55c48082254e1f55bcfa00808e45a50a9801
Author: Jan-Marek Glogowski 
AuthorDate: Thu Jan 20 10:06:54 2022 +0100
Commit: Jan-Marek Glogowski 
CommitDate: Thu Jan 20 14:57:49 2022 +0100

Fail on non-optional, but filtered component names

If any of the optional component lists contain a non-optional
component implementation, fail the component file generation and
show a diff of the offending component implementation name.

Change-Id: Ieac876e613f6945362186d4586dd2aacc5669920
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128645
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski 

diff --git a/config_host.mk.in b/config_host.mk.in
index fa1b854ca135..9a0388fa0d35 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -123,6 +123,7 @@ export DCONF_CFLAGS=@DCONF_CFLAGS@
 export DCONF_LIBS=@DCONF_LIBS@
 export DEFAULT_BRAND_IMAGES=@DEFAULT_BRAND_IMAGES@
 export DICT_SYSTEM_DIR=@DICT_SYSTEM_DIR@
+export DIFF=@DIFF@
 export DISABLE_CVE_TESTS=@DISABLE_CVE_TESTS@
 export DISABLE_DYNLOADING=@DISABLE_DYNLOADING@
 export DISABLE_PYTHON=@DISABLE_PYTHON@
diff --git a/configure.ac b/configure.ac
index 42f8291129bd..751ad1ebb872 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11408,9 +11408,17 @@ else
 fi
 fi
 AC_SUBST([FLEX])
+
+AC_PATH_PROG(DIFF, diff)
+if test -z "$DIFF"; then
+AC_MSG_ERROR(["diff" not found in \$PATH, install it])
+fi
+AC_SUBST([DIFF])
+
 dnl ***
 dnl Checking for patch
 dnl ***
+
 AC_PATH_PROG(PATCH, patch)
 if test -z "$PATCH"; then
 AC_MSG_ERROR(["patch" not found in \$PATH, install it])
@@ -11441,6 +11449,7 @@ fi
 if test "$GNUMAKE_WIN_NATIVE" = "TRUE" ; then
 GNUPATCH=`cygpath -m $GNUPATCH`
 fi
+AC_SUBST(GNUPATCH)
 
 dnl We also need to check for --with-gnu-cp
 
@@ -11484,7 +11493,6 @@ else
 esac
 fi
 
-AC_SUBST(GNUPATCH)
 AC_SUBST(GNUCP)
 AC_SUBST(x_GNUCP)
 
diff --git a/solenv/gbuild/ComponentTarget.mk b/solenv/gbuild/ComponentTarget.mk
index d317f1b05ae7..ce0224433661 100644
--- a/solenv/gbuild/ComponentTarget.mk
+++ b/solenv/gbuild/ComponentTarget.mk
@@ -49,6 +49,7 @@ endef
 $(call gb_ComponentTarget_get_clean_target,%) :
$(call gb_Output_announce,$*,$(false),CMP,1)
rm -f $(call gb_ComponentTarget_get_target,$*) \
+   $(call gb_ComponentTarget_get_target,$*).allfiltered \
$(call gb_ComponentTarget_get_target,$*).filtered \
$(call gb_ComponentTarget_get_target,$*).optionals \
 
@@ -61,12 +62,21 @@ $(call gb_ComponentTarget_get_target,%).optionals : \
| $(call gb_ComponentTarget_get_target,%).dir \
  $(call gb_ExternalExecutable_get_dependencies,xsltproc)
$(call gb_ExternalExecutable_get_command,xsltproc) --nonet \
-   $(gb_ComponentTarget_XSLT_DUMP_OPTIONALS) $(COMPONENTSOURCE) > $@ 
2>&1
+   $(gb_ComponentTarget_XSLT_DUMP_OPTIONALS) $(COMPONENTSOURCE) 2>&1 | 
sort > $@
 
 # %.filtered : list of all optional implementations we don't build
 .PRECIOUS: $(call gb_ComponentTarget_get_target,%).filtered
 $(call gb_ComponentTarget_get_target,%).filtered : $(call 
gb_ComponentTarget_get_target,%).optionals
-   cat $< $(COMPONENTIMPL) | sed -e '/^#\|^\s*$$/d' | sort | uniq -u > $@
+   cat $< $(COMPONENTIMPL) | sed -e '/^#/d' -e '/^[]*$$/d' | sort 
| uniq -u > $@
+
+# %.allfiltered : contains all possible filtered components, which must match 
%.optionals
+.PRECIOUS: $(call gb_ComponentTarget_get_target,%).allfiltered
+$(call gb_ComponentTarget_get_target,%).allfiltered : $(call 
gb_ComponentTarget_get_target,%).optionals
+   $(if $(ALLFILTEREDIMPL), \
+   cat $(ALLFILTEREDIMPL) | sed -e '/^#/d' -e '/^[ ]*$$/d' | sort 
| uniq > $@.tmp, \
+   touch $@.tmp)
+   $(DIFF) -u $< $@.tmp
+   mv $@.tmp $@
 
 # when a library is renamed, the component file needs to be rebuilt to match.
 # hence simply depend on Repository{,Fixes}.mk since the command runs quickly.
@@ -74,6 +84,7 @@ $(call gb_ComponentTarget_get_target,%) : \
$(SRCDIR)/Repository.mk \
$(SRCDIR)/RepositoryFixes.mk \
$(gb_ComponentTarget_XSLT_CREATE_COMPONENT) \
+   $(call gb_ComponentTarget_get_target,%).allfiltered \
$(call gb_ComponentTarget_get_target,%).filtered \
| $(call gb_ExternalExecutable_get_dependencies,xsltproc)
$(call gb_Output_announce,$*,$(true),CMP,1)
@@ -81,14 +92,19 @@ $(call gb_ComponentTarget_get_target,%) : \
$(call gb_ComponentTarget__command,$@)
$(call gb_Trace_EndRange,$*,CMP)
 
+gb_ComponentTarget__init_source = $(call 

[Libreoffice-commits] core.git: config_host.mk.in configure.ac solenv/gbuild

[Jan-Marek Glogowski (via logerrit)]

 config_host.mk.in  |2 +-
 configure.ac   |   25 -
 solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk |5 +
 solenv/gbuild/platform/com_GCC_defs.mk |2 +-
 4 files changed, 23 insertions(+), 11 deletions(-)

New commits:
commit dd30f90b3846c4fa7d8214c95a4ca31f2a7b3d72
Author: Jan-Marek Glogowski 
AuthorDate: Sat Oct 2 12:40:03 2021 +0200
Commit: Jan-Marek Glogowski 
CommitDate: Wed Jan 19 17:10:21 2022 +0100

WASM support external DWARF info

merged into the --enable-split-debug tests.

Change-Id: Id0f25bec08bd45daebb0ccd30d17a4feeb08d02c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128601
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski 

diff --git a/config_host.mk.in b/config_host.mk.in
index 89b433e47168..ee7d7cbce492 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -274,13 +274,13 @@ export 
HAVE_BROKEN_GCC_WSTRINGOP_OVERFLOW=@HAVE_BROKEN_GCC_WSTRINGOP_OVERFLOW@
 export 
HAVE_CLANG_DEBUG_INFO_KIND_CONSTRUCTOR=@HAVE_CLANG_DEBUG_INFO_KIND_CONSTRUCTOR@
 export HAVE_CXX20_ATOMIC_REF=@HAVE_CXX20_ATOMIC_REF@
 export HAVE_DLLEXPORTINLINES=@HAVE_DLLEXPORTINLINES@
+export HAVE_EXTERNAL_DWARF=@HAVE_EXTERNAL_DWARF@
 export HAVE_LO_CLANG_DLLEXPORTINLINES=@HAVE_LO_CLANG_DLLEXPORTINLINES@
 export HAVE_GCC_AVX=@HAVE_GCC_AVX@
 export HAVE_GCC_BUILTIN_ATOMIC=@HAVE_GCC_BUILTIN_ATOMIC@
 export HAVE_GCC_FNO_ENFORCE_EH_SPECS=@HAVE_GCC_FNO_ENFORCE_EH_SPECS@
 export HAVE_GCC_FNO_SIZED_DEALLOCATION=@HAVE_GCC_FNO_SIZED_DEALLOCATION@
 export HAVE_GCC_GGDB2=@HAVE_GCC_GGDB2@
-export HAVE_GCC_SPLIT_DWARF=@HAVE_GCC_SPLIT_DWARF@
 export HAVE_GCC_STACK_CLASH_PROTECTION=@HAVE_GCC_STACK_CLASH_PROTECTION@
 export HAVE_GNUMAKE_FILE_FUNC=@HAVE_GNUMAKE_FILE_FUNC@
 export HAVE_LD_BSYMBOLIC_FUNCTIONS=@HAVE_LD_BSYMBOLIC_FUNCTIONS@
diff --git a/configure.ac b/configure.ac
index 0b3dbd5e42fc..c6e778253ef3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1114,11 +1114,13 @@ emscripten)
 using_x11=no
 test_openldap=no
 test_qt5=yes
+test_split_debug=yes
 test_system_freetype=no
 enable_compiler_plugins=no
 enable_customtarget_components=yes
 enable_qt5=yes
 enable_scripting=no
+enable_split_debug=yes
 enable_wasm_strip=yes
 with_system_zlib=no
 with_theme="colibre"
@@ -4579,7 +4581,7 @@ printf ("hello world\n");
 }
 USE_LD=
 if test "$enable_ld" != "no"; then
-if test "$GCC" = "yes"; then
+if test "$GCC" = "yes" -a "$_os" != "Emscripten"; then
 if test -n "$enable_ld"; then
 check_use_ld "$enable_ld" fail_if_error
 elif test -z "$ENABLE_DEBUG$ENABLE_DBGUTIL"; then
@@ -4662,11 +4664,11 @@ printf ("hello world\n");
 fi
 AC_SUBST(LD_GC_SECTIONS)
 
-HAVE_GSPLIT_DWARF=
+HAVE_EXTERNAL_DWARF=
 if test "$enable_split_debug" != no; then
 use_split_debug=
 if test -n "$ENABLE_LTO"; then
-true # Inherently incompatible, since no debug info is created while 
compiling, GCC complains.
+: # Inherently incompatible, since no debug info is created while 
compiling, GCC complains.
 elif test "$enable_split_debug" = yes; then
 use_split_debug=1
 dnl Currently by default enabled only on Linux, feel free to set 
test_split_debug above also for other platforms.
@@ -4674,12 +4676,17 @@ if test "$enable_split_debug" != no; then
 use_split_debug=1
 fi
 if test -n "$use_split_debug"; then
-AC_MSG_CHECKING([whether $CC_BASE supports -gsplit-dwarf])
+if test "$_os" = "Emscripten"; then
+TEST_CC_FLAG=-gseparate-dwarf
+else
+TEST_CC_FLAG=-gsplit-dwarf
+fi
+AC_MSG_CHECKING([whether $CC_BASE supports $TEST_CC_FLAG])
 save_CFLAGS=$CFLAGS
-CFLAGS="$CFLAGS -Werror -gsplit-dwarf"
-AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[ return 0; ]])],[ 
HAVE_GCC_SPLIT_DWARF=TRUE ],[])
+CFLAGS="$CFLAGS -Werror $TEST_CC_FLAG"
+AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[ return 0; ]])],[ 
HAVE_EXTERNAL_DWARF=TRUE ],[])
 CFLAGS=$save_CFLAGS
-if test "$HAVE_GCC_SPLIT_DWARF" = "TRUE"; then
+if test "$HAVE_EXTERNAL_DWARF" = "TRUE"; then
 AC_MSG_RESULT([yes])
 else
 if test "$enable_split_debug" = yes; then
@@ -4689,12 +4696,12 @@ if test "$enable_split_debug" != no; then
 fi
 fi
 fi
-if test -z "$HAVE_GCC_SPLIT_DWARF" -a "$test_split_debug" = "yes" -a -n 
"$use_split_debug"; then
+if test -z "$HAVE_EXTERNAL_DWARF" -a "$test_split_debug" = "yes" -a -n 
"$use_split_debug"; then
 AC_MSG_WARN([Compiler is not capable of creating split debug info, 
linking will require more time and disk space.])
 add_warning "Compiler is not capable of creating split debug info, 
linking will require more time and disk space."
 fi
 fi
-AC_SUBST(HAVE_GCC_SPLIT_DWARF)
+AC_SUBST(HAVE_EXTERNAL_DWARF)
 
 

[Libreoffice-commits] core.git: config_host.mk.in configure.ac solenv/gbuild vcl/Library_vcl.mk

[Jan-Marek Glogowski (via logerrit)]

 config_host.mk.in  |1 +
 configure.ac   |   15 +++
 solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk |9 +++--
 vcl/Library_vcl.mk |   16 ++--
 4 files changed, 37 insertions(+), 4 deletions(-)

New commits:
commit ae22f7d06246ee21f9c8e9f35f4477e88843c58b
Author: Jan-Marek Glogowski 
AuthorDate: Sat Oct 2 12:43:07 2021 +0200
Commit: Jan-Marek Glogowski 
CommitDate: Wed Jan 19 16:13:14 2022 +0100

WASM add option to build with native exceptions

Currently disabled, as literally no runtime has a working
implementation. It also currently conflicts with LLVM's SjLj
(AKA setjmp / longjump) when generating WASM bytecode, but
the only offending code doesn't use exceptions, so this can
be avoided in general.

Change-Id: I2b338f3529e7350d54a7950772c6e7aae2282fe7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128600
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski 

diff --git a/config_host.mk.in b/config_host.mk.in
index 6eae920612f0..89b433e47168 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -210,6 +210,7 @@ export ENABLE_SKIA=@ENABLE_SKIA@
 export ENABLE_SKIA_DEBUG=@ENABLE_SKIA_DEBUG@
 export ENABLE_SYMBOLS_FOR=@ENABLE_SYMBOLS_FOR@
 export ENABLE_VALGRIND=@ENABLE_VALGRIND@
+export ENABLE_WASM_EXCEPTIONS=@ENABLE_WASM_EXCEPTIONS@
 export ENABLE_WASM_STRIP=@ENABLE_WASM_STRIP@
 export ENABLE_WERROR=@ENABLE_WERROR@
 export ENABLE_Z7_DEBUG=@ENABLE_Z7_DEBUG@
diff --git a/configure.ac b/configure.ac
index be3e9072195a..0b3dbd5e42fc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1990,6 +1990,13 @@ AC_ARG_ENABLE(wasm-strip,
 [Strip the static build like for WASM/emscripten platform.]),
 ,)
 
+AC_ARG_ENABLE(wasm-exceptions,
+AS_HELP_STRING([--enable-wasm-exceptions],
+[Build with native WASM exceptions (AKA -fwasm-exceptions),
+matter of fact, this is currently not finished by any implementation)
+(see https://webassembly.org/roadmap/ for the current state]),
+,)
+
 AC_ARG_ENABLE(xmlhelp,
 AS_HELP_STRING([--disable-xmlhelp],
 [Disable XML help support]),
@@ -3008,6 +3015,11 @@ if test "$enable_wasm_strip" = "yes"; then
 test "${with_locales+set}" = set || with_locales=en
 fi
 
+if test "$enable_wasm_exceptions" = yes; then
+ENABLE_WASM_EXCEPTIONS=TRUE
+fi
+AC_SUBST(ENABLE_WASM_EXCEPTIONS)
+
 # Whether to build "avmedia" functionality or not.
 
 if test "$enable_avmedia" = yes; then
@@ -6029,6 +6041,9 @@ if test -z "$enable_pch"; then
 enable_pch=no
 fi
 fi
+if test "$enable_pch" != no -a "$_os" = Emscripten -a 
"$ENABLE_WASM_EXCEPTIONS" = TRUE; then
+AC_MSG_ERROR([PCH currently isn't supported for Emscripten with native EH 
(nEH) because of missing Sj/Lj support with nEH in clang.])
+fi
 if test "$enable_pch" != "no" -a "$_os" != "WINNT" -a "$GCC" != "yes" ; then
 AC_MSG_ERROR([Precompiled header not yet supported for your 
platform/compiler])
 fi
diff --git a/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk 
b/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk
index 68ad8ec4be69..f0063f7c07b1 100644
--- a/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk
@@ -31,11 +31,16 @@ gb_EMSCRIPTEN_LDFLAGS += --bind -s FORCE_FILESYSTEM=1 -s 
WASM_BIGINT=1 -s ERROR_
 gb_EMSCRIPTEN_QTDEFS := -DQT_NO_LINKED_LIST -DQT_NO_JAVA_STYLE_ITERATORS 
-DQT_NO_EXCEPTIONS -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DQT_NO_DEBUG 
-DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB
 
 gb_Executable_EXT := .html
-gb_EMSCRIPTEN_EXCEPT := -s DISABLE_EXCEPTION_CATCHING=0
+ifeq ($(ENABLE_WASM_EXCEPTIONS),TRUE)
+gb_EMSCRIPTEN_EXCEPT = -fwasm-exceptions
+else
+gb_EMSCRIPTEN_EXCEPT = -s DISABLE_EXCEPTION_CATCHING=0
+endif
 
 gb_CXXFLAGS += $(gb_EMSCRIPTEN_CPPFLAGS)
+gb_LinkTarget_EXCEPTIONFLAGS += $(gb_EMSCRIPTEN_EXCEPT)
 gb_LinkTarget_CFLAGS += $(gb_EMSCRIPTEN_CPPFLAGS) $(gb_EMSCRIPTEN_QTDEFS)
-gb_LinkTarget_CXXFLAGS += $(gb_EMSCRIPTEN_CPPFLAGS) $(gb_EMSCRIPTEN_QTDEFS) 
$(gb_EMSCRIPTEN_EXCEPT)
+gb_LinkTarget_CXXFLAGS += $(gb_EMSCRIPTEN_CPPFLAGS) $(gb_EMSCRIPTEN_QTDEFS)
 gb_LinkTarget_LDFLAGS += $(gb_EMSCRIPTEN_LDFLAGS) $(gb_EMSCRIPTEN_CPPFLAGS) 
$(gb_EMSCRIPTEN_EXCEPT)
 
 # Linker and compiler optimize + debug flags are handled in LinkTarget.mk
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 7664927c257a..4c3abf6f08e9 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -93,6 +93,20 @@ $(eval $(call gb_Library_use_externals,vcl,\
 mdds_headers \
 ))
 
+# WASM LLVM doesn't support native EH + SjLj (setjump / longjump) used by 
libjpeg / libpng.
+# This otherwise breaks the PCH generation, so just move the files for that 
case.
+ifeq (EMSCRIPTEN_TRUE,$(OS)_$(ENABLE_WASM_EXCEPTIONS))
+$(eval $(call gb_Library_add_cxxobjects,vcl,\
+vcl/source/filter/jpeg/jpegc \
+vcl/source/filter/png/PngImageReader \
+))
+else
+$(eval 

[Libreoffice-commits] core.git: config_host.mk.in configure.ac solenv/gbuild

[Stephan Bergmann (via logerrit)]

 config_host.mk.in|1 
 configure.ac |   57 ++-
 solenv/gbuild/platform/macosx.mk |2 -
 3 files changed, 4 insertions(+), 56 deletions(-)

New commits:
commit b0ab07ba89c88006932c68e0ca08dffcd0a4621e
Author: Stephan Bergmann 
AuthorDate: Thu Jan 13 08:06:12 2022 +0100
Commit: Stephan Bergmann 
CommitDate: Thu Jan 13 09:33:25 2022 +0100

Always set MAC_OS_X_VERSION_MAX_ALLOWED = MAC_OS_X_VERSION_MIN_REQUIRED

...and drop the --with-macosx-version-max-allowed configure switch.

Looking at the documentation in

/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/AvailabilityMacros.h,
a value of MAC_OS_X_VERSION_MAX_ALLOWED larger than
MAC_OS_X_VERSION_MIN_REQUIRED would allow functions that only started to 
become
available in that range to be resolved as null at runtime, so would need our
code to be prepared to get null function pointers in such cases, but which 
our
code is presumably not prepared for to begin with, anyway.

Change-Id: I1423ee7435aa2b36eb91c62ff91b1fc414995a4f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128363
Reviewed-by: Tor Lillqvist 
Tested-by: Jenkins

diff --git a/config_host.mk.in b/config_host.mk.in
index 8d7b6bdfe7bf..c5a945b96522 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -425,7 +425,6 @@ export 
MACOSX_CODESIGNING_IDENTITY=@MACOSX_CODESIGNING_IDENTITY@
 export MACOSX_DEPLOYMENT_TARGET=@MACOSX_DEPLOYMENT_TARGET@
 export MACOSX_PACKAGE_SIGNING_IDENTITY=@MACOSX_PACKAGE_SIGNING_IDENTITY@
 export MACOSX_SDK_PATH=@MACOSX_SDK_PATH@
-export MAC_OS_X_VERSION_MAX_ALLOWED=@MAC_OS_X_VERSION_MAX_ALLOWED@
 export MAC_OS_X_VERSION_MIN_REQUIRED=@MAC_OS_X_VERSION_MIN_REQUIRED@
 export MANDIR=@MANDIR@
 export MARIADBC_MAJOR=@MARIADBC_MAJOR@
diff --git a/configure.ac b/configure.ac
index de2ff85defcc..911a02107f52 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2813,14 +2813,6 @@ AC_ARG_WITH(macosx-version-min-required,
 ],
 ,)
 
-AC_ARG_WITH(macosx-version-max-allowed,
-AS_HELP_STRING([--with-macosx-version-max-allowed=],
-[set the maximum allowed OS version the LibreOffice compilation can 
use APIs from])
-[
-  e. g.: --with-macosx-version-max-allowed=11.0
-],
-,)
-
 
 dnl ===
 dnl options for stuff used during cross-compilation build
@@ -,10 +3325,6 @@ if test $_os = Darwin; then
 fi
 fi
 
-if test "$with_macosx_version_max_allowed" = "" ; then
-with_macosx_version_max_allowed="$macosx_sdk"
-fi
-
 # export this so that "xcrun" invocations later return matching values
 DEVELOPER_DIR="${MACOSX_SDK_PATH%/SDKs*}"
 DEVELOPER_DIR="${DEVELOPER_DIR%/Platforms*}"
@@ -3422,51 +3410,13 @@ if test $_os = Darwin; then
 RANLIB=`xcrun -find ranlib`
 fi
 
-case "$with_macosx_version_max_allowed" in
-10.13)
-MAC_OS_X_VERSION_MAX_ALLOWED="101300"
-;;
-10.14)
-MAC_OS_X_VERSION_MAX_ALLOWED="101400"
-;;
-10.15)
-MAC_OS_X_VERSION_MAX_ALLOWED="101500"
-;;
-11.0)
-MAC_OS_X_VERSION_MAX_ALLOWED="11"
-;;
-11.1)
-MAC_OS_X_VERSION_MAX_ALLOWED="110100"
-;;
-11.3)
-MAC_OS_X_VERSION_MAX_ALLOWED="110300"
-;;
-12.0)
-MAC_OS_X_VERSION_MAX_ALLOWED="12"
-;;
-12.1)
-MAC_OS_X_VERSION_MAX_ALLOWED="120100"
-;;
-*)
-AC_MSG_ERROR([with-macosx-version-max-allowed 
$with_macosx_version_max_allowed is not a supported value, supported values are 
10.13--12.1])
-;;
-esac
-
-AC_MSG_CHECKING([that macosx-version-min-required is coherent with 
macosx-version-max-allowed])
-if test $MAC_OS_X_VERSION_MIN_REQUIRED -gt $MAC_OS_X_VERSION_MAX_ALLOWED; 
then
-AC_MSG_ERROR([the version minimum required, 
$MAC_OS_X_VERSION_MIN_REQUIRED, must be <= the version maximum allowed, 
$MAC_OS_X_VERSION_MAX_ALLOWED])
-else
-AC_MSG_RESULT([ok])
-fi
-
-AC_MSG_CHECKING([that macosx-version-max-allowed is coherent with 
macos-with-sdk])
-if test $MAC_OS_X_VERSION_MAX_ALLOWED -gt $MACOSX_SDK_VERSION; then
-AC_MSG_ERROR([the version maximum allowed cannot be greater than the 
sdk level])
+AC_MSG_CHECKING([that macosx-version-min-required is coherent with 
macos-with-sdk])
+if test $MAC_OS_X_VERSION_MIN_REQUIRED -gt $MACOSX_SDK_VERSION; then
+AC_MSG_ERROR([the version minimum required cannot be greater than the 
sdk level])
 else
 AC_MSG_RESULT([ok])
 fi
 
AC_MSG_NOTICE([MAC_OS_X_VERSION_MIN_REQUIRED=$MAC_OS_X_VERSION_MIN_REQUIRED])
-AC_MSG_NOTICE([MAC_OS_X_VERSION_MAX_ALLOWED=$MAC_OS_X_VERSION_MAX_ALLOWED])
 
 AC_MSG_CHECKING([whether to do code signing])
 
@@ -3542,7 +3492,6 @@ fi
 

[Libreoffice-commits] core.git: config_host.mk.in configure.ac solenv/gbuild

[Jan-Marek Glogowski (via logerrit)]

 config_host.mk.in   |1 +
 configure.ac|   12 
 solenv/gbuild/LinkTarget.mk |1 +
 solenv/gbuild/platform/com_MSC_class.mk |2 ++
 4 files changed, 16 insertions(+)

New commits:
commit 1bb248fa3670ac11d4623ba14d1e914554fb6971
Author: Jan-Marek Glogowski 
AuthorDate: Fri Dec 31 22:52:47 2021 +0100
Commit: Jan-Marek Glogowski 
CommitDate: Sat Jan 1 11:50:02 2022 +0100

gbuild: silence Windows Skia clang builds

When building Skia on Windows in an non-English environment, the
console is filled with "Note: including file:" output. That's
because cl.exe has some translated output, but clang.exe has not.

So detect the clang usage and its "showIncludes" output and
override that setting for the compiler call.

Change-Id: I19b403aa79a8dde70616865aef051aa365f79de6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127822
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski 

diff --git a/config_host.mk.in b/config_host.mk.in
index dfcd2f169b1c..578926500b48 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -418,6 +418,7 @@ export 
LO_CLANG_CXXFLAGS_INTRINSICS_AVX512=@LO_CLANG_CXXFLAGS_INTRINSICS_AVX512@
 export 
LO_CLANG_CXXFLAGS_INTRINSICS_AVX512F=@LO_CLANG_CXXFLAGS_INTRINSICS_AVX512F@
 export LO_CLANG_CXXFLAGS_INTRINSICS_F16C=@LO_CLANG_CXXFLAGS_INTRINSICS_F16C@
 export LO_CLANG_CXXFLAGS_INTRINSICS_FMA=@LO_CLANG_CXXFLAGS_INTRINSICS_FMA@
+export LO_CLANG_SHOWINCLUDES_PREFIX=@LO_CLANG_SHOWINCLUDES_PREFIX@
 @x_LO_ELFCHECK_ALLOWLIST@ export LO_ELFCHECK_ALLOWLIST=@LO_ELFCHECK_ALLOWLIST@
 @x_Cygwin@ export LS=@WIN_LS@
 export MACOSX_BUNDLE_IDENTIFIER=@MACOSX_BUNDLE_IDENTIFIER@
diff --git a/configure.ac b/configure.ac
index 7d3df0f0b3d4..fb8d85a01f71 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12041,6 +12041,17 @@ if test "$ENABLE_SKIA" = TRUE -a "$COM_IS_CLANG" != 
TRUE; then
 else
 AC_MSG_RESULT([no])
 fi
+
+AC_MSG_CHECKING([the dependency generation prefix (clang.exe 
-showIncludes)])
+echo "#include " > conftest.c
+LO_CLANG_SHOWINCLUDES_PREFIX=`$LO_CLANG_CC $CFLAGS -c 
-showIncludes conftest.c 2>/dev/null | \
+grep 'stdlib\.h' | head -n1 | sed 's/ [[[:alpha:]]]:.*//'`
+rm -f conftest.c conftest.obj
+if test -z "$LO_CLANG_SHOWINCLUDES_PREFIX"; then
+AC_MSG_ERROR([cannot determine the -showIncludes prefix])
+else
+AC_MSG_RESULT(["$LO_CLANG_SHOWINCLUDES_PREFIX"])
+fi
 else
 AC_CHECK_PROG(LO_CLANG_CC,clang,clang,[])
 AC_CHECK_PROG(LO_CLANG_CXX,clang++,clang++,[])
@@ -12348,6 +12359,7 @@ AC_SUBST(LO_CLANG_CXXFLAGS_INTRINSICS_AVX512)
 AC_SUBST(LO_CLANG_CXXFLAGS_INTRINSICS_AVX512F)
 AC_SUBST(LO_CLANG_CXXFLAGS_INTRINSICS_F16C)
 AC_SUBST(LO_CLANG_CXXFLAGS_INTRINSICS_FMA)
+AC_SUBST(LO_CLANG_SHOWINCLUDES_PREFIX)
 AC_SUBST(CLANG_USE_LD)
 AC_SUBST([HAVE_LO_CLANG_DLLEXPORTINLINES])
 
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 7f72ab131ac8..3f4e329587b8 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -2085,6 +2085,7 @@ endef
 define gb_LinkTarget_use_clang
 $(call gb_LinkTarget_get_target,$(1)) : T_CC := $(LO_CLANG_CC)
 $(call gb_LinkTarget_get_target,$(1)) : T_CXX := $(LO_CLANG_CXX)
+$(call gb_LinkTarget_get_target,$(1)) : T_USE_CLANG := $(true)
 $(call gb_LinkTarget_get_target,$(1)) : T_USE_LD := $(or 
$(CLANG_USE_LD),$(USE_LD))
 $(call gb_LinkTarget_get_target,$(1)) : T_LTOFLAGS := $(or 
$(gb_CLANG_LTOFLAGS),$(gb_LTOFLAGS))
 endef
diff --git a/solenv/gbuild/platform/com_MSC_class.mk 
b/solenv/gbuild/platform/com_MSC_class.mk
index dd4a550b7512..28657adb6aae 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -65,6 +65,7 @@ define gb_CObject__command_pattern
 $(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $(1)) $(dir $(4)) && \
unset INCLUDE && \
+   $(if $(and $(gb_COMPILERDEPFLAGS),$(T_USE_CLANG)), export 
SHOWINCLUDES_PREFIX="${LO_CLANG_SHOWINCLUDES_PREFIX}" &&) \
$(gb_COMPILER_SETUP) \
$(call gb_CObject__compiler,$(2),$(3),$(6)) \
$(call gb_Helper_remove_overridden_flags, \
@@ -108,6 +109,7 @@ $(call gb_Output_announce,$(2),$(true),PCH,1)
 $(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $(1)) $(dir $(call 
gb_PrecompiledHeader_get_dep_target,$(2),$(6))) && \
unset INCLUDE && \
+   $(if $(and $(gb_COMPILERDEPFLAGS),$(T_USE_CLANG)), export 
SHOWINCLUDES_PREFIX="${LO_CLANG_SHOWINCLUDES_PREFIX}" &&) \
CCACHE_DISABLE=1 $(gb_COMPILER_SETUP) \
$(call gb_CObject__compiler,$(4),$(3),$(7)) \
$(call gb_Helper_remove_overridden_flags, \

[Libreoffice-commits] core.git: config_host.mk.in configure.ac solenv/gbuild solenv/gcc-wrappers

[Luboš Luňák (via logerrit)]

 config_host.mk.in   |2 --
 configure.ac|8 
 solenv/gbuild/platform/com_MSC_class.mk |4 ++--
 solenv/gbuild/platform/com_MSC_defs.mk  |2 +-
 solenv/gcc-wrappers/wrapper.cxx |9 +++--
 5 files changed, 10 insertions(+), 15 deletions(-)

New commits:
commit 9b9a8f47894760e7a95ed276feeef00d3b1c94d1
Author: Luboš Luňák 
AuthorDate: Tue Nov 2 18:28:53 2021 +
Commit: Luboš Luňák 
CommitDate: Wed Nov 3 07:27:21 2021 +0100

fix gcc-wrapper for ccache.exe

This reverts a part of 18cc01b63996f81b284e3bc827d1be7f3da8983a .

Change-Id: Ib7abbc41eeb6abd573f540ae2d0d2822e68b9abb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124613
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 

diff --git a/config_host.mk.in b/config_host.mk.in
index 4b4f58f80fc2..ff8944af0cce 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -667,8 +667,6 @@ export TOUCH=@TOUCH@
 export UCRTSDKDIR=@UCRTSDKDIR@
 export UCRTVERSION=@UCRTVERSION@
 export UCRT_REDISTDIR=@UCRT_REDISTDIR@
-export UNCACHED_CC=@UNCACHED_CC@
-export UNCACHED_CXX=@UNCACHED_CXX@
 export USE_LD=@USE_LD@
 export USE_LIBRARY_BIN_TAR=@USE_LIBRARY_BIN_TAR@
 export USE_XINERAMA=@USE_XINERAMA@
diff --git a/configure.ac b/configure.ac
index 2c7ed9fb3aec..78dc6c8deae6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4318,7 +4318,6 @@ AC_SUBST(SHOWINCLUDES_PREFIX)
 #
 # prefix C with ccache if needed
 #
-UNCACHED_CC="$CC"
 if test "$CCACHE" != ""; then
 AC_MSG_CHECKING([whether $CC_BASE is already ccached])
 
@@ -6792,7 +6791,6 @@ AC_SUBST(BOOST_CXXFLAGS)
 #
 # prefx CXX with ccache if needed
 #
-UNCACHED_CXX="$CXX"
 if test "$CCACHE" != ""; then
 AC_MSG_CHECKING([whether $CXX_BASE is already ccached])
 AC_LANG_PUSH([C++])
@@ -12360,8 +12358,6 @@ fi
 #
 # prefix LO_CLANG_CC/LO_CLANG_CXX with ccache if needed
 #
-UNCACHED_CLANG_CC="$LO_CLANG_CC"
-UNCACHED_CLANG_CXX="$LO_CLANG_CXX"
 if test "$CCACHE" != "" -a -n "$LO_CLANG_CC" -a -n "$LO_CLANG_CXX"; then
 AC_MSG_CHECKING([whether $LO_CLANG_CC is already ccached])
 AC_LANG_PUSH([C])
@@ -12402,12 +12398,8 @@ if test "$CCACHE" != "" -a -n "$LO_CLANG_CC" -a -n 
"$LO_CLANG_CXX"; then
 AC_LANG_POP([C++])
 fi
 
-AC_SUBST(UNCACHED_CC)
-AC_SUBST(UNCACHED_CXX)
 AC_SUBST(LO_CLANG_CC)
 AC_SUBST(LO_CLANG_CXX)
-AC_SUBST(UNCACHED_CLANG_CC)
-AC_SUBST(UNCACHED_CLANG_CXX)
 AC_SUBST(LO_CLANG_CXXFLAGS_INTRINSICS_SSE2)
 AC_SUBST(LO_CLANG_CXXFLAGS_INTRINSICS_SSSE3)
 AC_SUBST(LO_CLANG_CXXFLAGS_INTRINSICS_SSE41)
diff --git a/solenv/gbuild/platform/com_MSC_class.mk 
b/solenv/gbuild/platform/com_MSC_class.mk
index f02e2a48649f..f0da634be0b9 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -623,10 +623,10 @@ endef
 # /opt/lo/bin/ccache /cygdrive/c/PROGRA~2/MICROS~2.0/VC/bin/cl.exe
 
 gb_AUTOCONF_WRAPPERS = \
-   REAL_CC="$(shell cygpath -w $(filter-out -%,$(UNCACHED_CC)))" \
+   REAL_CC="$(shell cygpath -w $(filter-out -%,$(CC)))" \
REAL_CC_FLAGS="$(filter -%,$(CC))" \
CC="$(call gb_Executable_get_target_for_build,gcc-wrapper)" \
-   REAL_CXX="$(shell cygpath -w $(filter-out -%,$(UNCACHED_CXX)))" \
+   REAL_CXX="$(shell cygpath -w $(filter-out -%,$(CXX)))" \
REAL_CXX_FLAGS="$(filter -%,$(CXX))" \
CXX="$(call gb_Executable_get_target_for_build,g++-wrapper)" \
 LD="$(shell cygpath -w $(COMPATH)/bin/link.exe) -nologo"
diff --git a/solenv/gbuild/platform/com_MSC_defs.mk 
b/solenv/gbuild/platform/com_MSC_defs.mk
index 8dccadd1f743..e1912285c4b7 100644
--- a/solenv/gbuild/platform/com_MSC_defs.mk
+++ b/solenv/gbuild/platform/com_MSC_defs.mk
@@ -319,7 +319,7 @@ endef
 # we explicitly have to replace cygwin with mingw32 for the host, but the 
build must stay cygwin, or cmd.exe processes will be spawned
 gb_WIN_GPG_WINDRES_target := $(if $(filter INTEL,$(CPUNAME)),pe-i386,pe-x86-64)
 gb_WIN_GPG_platform_switches := --build=$(BUILD_PLATFORM) --host=$(subst 
cygwin,mingw32,$(HOST_PLATFORM))
-gb_WIN_GPG_cross_setup_exports = export REAL_BUILD_CC="$(filter-out 
-%,$(UNCACHED_CC))" REAL_BUILD_CC_FLAGS="$(filter -%,$(UNCACHED_CC))" \
+gb_WIN_GPG_cross_setup_exports = export REAL_BUILD_CC="$(filter-out 
-%,$(CC_FOR_BUILD))" REAL_BUILD_CC_FLAGS="$(filter -%,$(CC_FOR_BUILD))" \
 && export CC_FOR_BUILD="$(call 
gb_Executable_get_target_for_build,gcc-wrapper) 
--wrapper-env-prefix=REAL_BUILD_ $(SOLARINC) -L$(subst ;, 
-L,$(ILIB_FOR_BUILD))" \
 && export RC='windres -O COFF --target=$(gb_WIN_GPG_WINDRES_target) 
--preprocessor=$(call gb_Executable_get_target_for_build,cpp) 
--preprocessor-arg=-+ -DRC_INVOKED -DWINAPI_FAMILY=0 $(SOLARINC)'
 
diff --git a/solenv/gcc-wrappers/wrapper.cxx b/solenv/gcc-wrappers/wrapper.cxx
index 72e48e5a7b37..3504d3d8c5ab 100644
--- a/solenv/gcc-wrappers/wrapper.cxx
+++ b/solenv/gcc-wrappers/wrapper.cxx
@@ -251,9 +251,14 @@ int startprocess(std::string command, std::string args, 

[Libreoffice-commits] core.git: config_host.mk.in configure.ac solenv/gbuild

[Thorsten Behrens (via logerrit)]

 config_host.mk.in   |1 -
 configure.ac|1 -
 solenv/gbuild/platform/com_MSC_class.mk |4 
 solenv/gbuild/platform/com_MSC_defs.mk  |   12 +++-
 4 files changed, 3 insertions(+), 15 deletions(-)

New commits:
commit da36d655608c3da39fd79d95974e1f7404a27aa0
Author: Thorsten Behrens 
AuthorDate: Tue Aug 3 18:32:16 2021 +0200
Commit: Thorsten Behrens 
CommitDate: Wed Aug 4 11:08:29 2021 +0200

Always provision PATH the cygwin way under Windows

With PATH essentially serving the role of LD_LIBRARY_PATH under
Windows, there was the notion that this needs to be provided in
Windows notation, for win32 gnumake.

That was perhaps once true; currently we're always evaluating PATH
inside a shell, not the Makefile. So this since a while only worked
accidentally, due to cygwin transparently converting between DOS and
UNIX PATH vars. It did break though for corner-cases, e.g.
SRCDIR!=BUILDDIR, and BUILDDIR e.g. D:\FOO.

With that simplification, also GNUMAKE_WIN_NATIVE can go.

Change-Id: Ied5a0443dc70e7dc629c0c0620e6ce911d9a73d0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119941
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 

diff --git a/config_host.mk.in b/config_host.mk.in
index d74fecae9522..58ca1d1c14fb 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -243,7 +243,6 @@ export GNUTLS_CFLAGS=$(gb_SPACE)@GNUTLS_CFLAGS@
 export GNUTLS_LIBS=$(gb_SPACE)@GNUTLS_LIBS@
 export PARALLELISM?=@PARALLELISM@
 @x_GNUCP@ export GNUCOPY=@GNUCP@
-export GNUMAKE_WIN_NATIVE=@GNUMAKE_WIN_NATIVE@
 export GNUPATCH=@GNUPATCH@
 export GNUTAR=@GNUTAR@
 export GOBJECT_CFLAGS=$(gb_SPACE)@GOBJECT_CFLAGS@
diff --git a/configure.ac b/configure.ac
index 675a6a1e8395..3d2bf7e24555 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6095,7 +6095,6 @@ else
 fi
 rm -rf $TESTGMAKEFILEFUNC
 AC_SUBST(HAVE_GNUMAKE_FILE_FUNC)
-AC_SUBST(GNUMAKE_WIN_NATIVE)
 
 _make_ver_check=`$GNUMAKE --version | grep "Built for Windows"`
 STALE_MAKE=
diff --git a/solenv/gbuild/platform/com_MSC_class.mk 
b/solenv/gbuild/platform/com_MSC_class.mk
index 76dea12e1ec6..0d35b7915999 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -470,11 +470,7 @@ endef
 gb_CppunitTest_UNITTESTFAILED := $(GBUILDDIR)/platform/unittest-failed-WNT.sh
 gb_CppunitTest_PYTHONDEPS := $(call gb_Package_get_target,python3)
 gb_CppunitTest_DEFS := -D_DLL
-ifeq ($(GNUMAKE_WIN_NATIVE),TRUE)
-gb_CppunitTest_CPPTESTPRECOMMAND := $(call gb_Helper_prepend_ld_path,$(shell 
cygpath -w $(gb_Library_DLLDIR));$(shell cygpath -w 
$(WORKDIR)/UnpackedTarball/cppunit/src/cppunit/$(if 
$(MSVC_USE_DEBUG_RUNTIME),DebugDll,ReleaseDll)))
-else
 gb_CppunitTest_CPPTESTPRECOMMAND := $(call gb_Helper_prepend_ld_path,$(shell 
cygpath -u $(gb_Library_DLLDIR)):$(shell cygpath -u 
$(WORKDIR)/UnpackedTarball/cppunit/src/cppunit/$(if 
$(MSVC_USE_DEBUG_RUNTIME),DebugDll,ReleaseDll)))
-endif
 gb_CppunitTest_get_filename = test_$(1).dll
 gb_CppunitTest_get_ilibfilename = itest_$(1).lib
 
diff --git a/solenv/gbuild/platform/com_MSC_defs.mk 
b/solenv/gbuild/platform/com_MSC_defs.mk
index 1fa6d87bdd29..07720dc2e2f1 100644
--- a/solenv/gbuild/platform/com_MSC_defs.mk
+++ b/solenv/gbuild/platform/com_MSC_defs.mk
@@ -297,21 +297,15 @@ endif
 
 # Helper class
 
-ifeq ($(GNUMAKE_WIN_NATIVE),TRUE)
-gb_MAKE_CYGPATH := -w
-else
-gb_MAKE_CYGPATH := -u
-endif
-
-gb_Helper_set_ld_path := PATH="$(shell cygpath $(gb_MAKE_CYGPATH) 
$(INSTDIR_FOR_BUILD)/$(LIBO_URE_LIB_FOLDER));$(shell cygpath $(gb_MAKE_CYGPATH) 
$(INSTDIR_FOR_BUILD)/$(LIBO_BIN_FOLDER));$$PATH"
+gb_Helper_set_ld_path := PATH="$(shell cygpath -u 
$(INSTDIR_FOR_BUILD)/$(LIBO_URE_LIB_FOLDER)):$(shell cygpath -u 
$(INSTDIR_FOR_BUILD)/$(LIBO_BIN_FOLDER)):$$PATH"
 
 define gb_Helper_prepend_ld_path
-PATH="$(shell cygpath $(gb_MAKE_CYGPATH) 
$(INSTDIR_FOR_BUILD)/$(LIBO_URE_LIB_FOLDER));$(shell cygpath $(gb_MAKE_CYGPATH) 
$(INSTDIR_FOR_BUILD)/$(LIBO_BIN_FOLDER));$(1);$$PATH"
+PATH="$(shell cygpath -u $(INSTDIR_FOR_BUILD)/$(LIBO_URE_LIB_FOLDER)):$(shell 
cygpath -u $(INSTDIR_FOR_BUILD)/$(LIBO_BIN_FOLDER)):$(1):$$PATH"
 endef
 
 # $(1): one directory pathname to append to the ld path
 define gb_Helper_extend_ld_path
-$(gb_Helper_set_ld_path)';$(shell cygpath $(gb_MAKE_CYGPATH) $(1))'
+$(gb_Helper_set_ld_path)':$(shell cygpath -u $(1))'
 endef
 
 # common macros to build GPG related libraries

[Libreoffice-commits] core.git: config_host.mk.in configure.ac solenv/gbuild

[Jan-Marek Glogowski (via logerrit)]

 config_host.mk.in   |1 +
 configure.ac|   13 +
 solenv/gbuild/gbuild.mk |4 
 3 files changed, 18 insertions(+)

New commits:
commit 27cc1d10421777469c89cd1ec30229643b1a03ea
Author: Jan-Marek Glogowski 
AuthorDate: Thu Apr 29 19:40:14 2021 +0200
Commit: Thorsten Behrens 
CommitDate: Wed May 5 21:16:23 2021 +0200

Add --enable-wasm-strip

Will just set enable wasm strip for cross-target

Change-Id: I0840b843794e4fab694df26608619a7bf06f5e5f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114981
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 

diff --git a/config_host.mk.in b/config_host.mk.in
index 5cc02e393589..d45511061037 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -200,6 +200,7 @@ export ENABLE_SKIA=@ENABLE_SKIA@
 export ENABLE_SKIA_DEBUG=@ENABLE_SKIA_DEBUG@
 export ENABLE_SYMBOLS_FOR=@ENABLE_SYMBOLS_FOR@
 export ENABLE_VALGRIND=@ENABLE_VALGRIND@
+export ENABLE_WASM_STRIP=@ENABLE_WASM_STRIP@
 export ENABLE_WERROR=@ENABLE_WERROR@
 export ENDIANNESS=@ENDIANNESS@
 export EPM=@EPM@
diff --git a/configure.ac b/configure.ac
index 9a9e42031ae1..44ea1276283c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1895,6 +1895,12 @@ AC_ARG_ENABLE(curl,
 [Disable CURL support.]),
 ,enable_curl=yes)
 
+AC_ARG_ENABLE(wasm-strip,
+AS_HELP_STRING([--enable-wasm-strip],
+[Strip the static build like for WASM/emscripten platform.]),
+,enable_wasm_strip=yes)
+
+
 dnl ===
 dnl Optional Packages (--with/without-)
 dnl ===
@@ -3721,13 +3727,19 @@ if test "$_os" = "iOS" -o "$build_cpu" != "$host_cpu"; 
then
 cross_compiling="yes"
 fi
 fi
+
+ENABLE_WASM_STRIP=''
 if test "$cross_compiling" = "yes"; then
 export CROSS_COMPILING=TRUE
+if test "$enable_dynamic_loading" != yes -a "$enable_wasm_strip" = yes; 
then
+ENABLE_WASM_STRIP=TRUE
+fi
 else
 CROSS_COMPILING=
 BUILD_TYPE="$BUILD_TYPE NATIVE"
 fi
 AC_SUBST(CROSS_COMPILING)
+AC_SUBST(ENABLE_WASM_STRIP)
 
 # Use -isystem (gcc) if possible, to avoid warnings in 3rd party headers.
 # NOTE: must _not_ be used for bundled external libraries!
@@ -5302,6 +5314,7 @@ if test "$cross_compiling" = "yes"; then
 test -n "$TARFILE_LOCATION" && sub_conf_opts="$sub_conf_opts 
--with-external-tar=$TARFILE_LOCATION"
 test "$with_system_icu_for_build" = "yes" -o "$with_system_icu_for_build" 
= "force" && sub_conf_opts="$sub_conf_opts --with-system-icu"
 test "$with_galleries" = "no" -o -z "$WITH_GALLERY_BUILD" && 
sub_conf_opts="$sub_conf_opts --with-galleries=no"
+test "$enable_wasm_strip" = "yes" && sub_conf_opts="$sub_conf_opts 
--enable-wasm-strip"
 sub_conf_opts="$sub_conf_opts $with_build_platform_configure_options"
 
 # Don't bother having configure look for stuff not needed for the build 
platform anyway
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 1afa9e0451af..08c82f5e8d1f 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -220,6 +220,10 @@ gb_GLOBALDEFS := \
$(gb_COMPILERDEFS) \
$(gb_CPUDEFS) \
 
+ifeq ($(ENABLE_WASM_STRIP),TRUE)
+gb_GLOBALDEFS += -DENABLE_WASM_STRIP
+endif
+
 ifeq ($(gb_ENABLE_DBGUTIL),$(true))
 gb_GLOBALDEFS += -DDBG_UTIL
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: config_host.mk.in configure.ac solenv/gbuild

[Thorsten Behrens (via logerrit)]

 config_host.mk.in   |2 +
 configure.ac|   45 +---
 solenv/gbuild/platform/com_MSC_class.mk |4 +-
 solenv/gbuild/platform/com_MSC_defs.mk  |2 -
 4 files changed, 41 insertions(+), 12 deletions(-)

New commits:
commit 18cc01b63996f81b284e3bc827d1be7f3da8983a
Author: Thorsten Behrens 
AuthorDate: Fri Apr 2 22:11:59 2021 +0200
Commit: Thorsten Behrens 
CommitDate: Sat Apr 3 21:17:48 2021 +0200

Add initial support for sccache builds on WNT

- gets auto-detected if an sccache binary is in the path
- currently external projects using gcc-wrapper are _not_
  cached - this needs fixing in the gcc-wrapper
- current sccache versions won't work with -Fp (precompiled
  headers), so while sccache gets called, nothing really
  is cached. Best build with --enable-pch=no therefore.

Change-Id: I78dd7e08ea20ae888236c8c8e8e7a25a405f23b5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113530
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 

diff --git a/config_host.mk.in b/config_host.mk.in
index 705af6b42213..98995fd115e6 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -634,6 +634,8 @@ export TOUCH=@TOUCH@
 export UCRTSDKDIR=@UCRTSDKDIR@
 export UCRTVERSION=@UCRTVERSION@
 export UCRT_REDISTDIR=@UCRT_REDISTDIR@
+export UNCACHED_CC=@UNCACHED_CC@
+export UNCACHED_CXX=@UNCACHED_CXX@
 export USE_LD=@USE_LD@
 export USE_LIBRARY_BIN_TAR=@USE_LIBRARY_BIN_TAR@
 export USE_XINERAMA=@USE_XINERAMA@
diff --git a/configure.ac b/configure.ac
index d8d336860b29..3df488a662c2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2939,11 +2939,28 @@ dnl 
===
 dnl  Checks if ccache is available
 dnl ===
 CCACHE_DEPEND_MODE=
-if test "$_os" = "WINNT"; then
-# on windows/VC build do not use ccache
-CCACHE=""
-elif test "$enable_ccache" = "no"; then
+if test "$enable_ccache" = "no"; then
 CCACHE=""
+elif test "$_os" = "WINNT"; then
+# on windows/VC build do not use ccache - but perhaps sccache is around?
+case "%$CC%$CXX%" in
+# If $CC and/or $CXX already contain "sccache" (possibly suffixed with 
some version number etc),
+# assume that's good then
+*%sccache[[-_' ']]*|*/sccache[[-_' ']]*)
+AC_MSG_NOTICE([sccache seems to be included in a pre-defined CC and/or 
CXX])
+CCACHE_DEPEND_MODE=1
+;;
+*)
+# for sharing code below, reuse CCACHE env var
+AC_PATH_PROG([CCACHE],[sccache],[not found])
+if test "$CCACHE" = "not found"; then
+CCACHE=""
+else
+CCACHE=`win_short_path_for_make "$CCACHE"`
+CCACHE_DEPEND_MODE=1
+fi
+;;
+esac
 elif test -n "$enable_ccache" -o \( "$enable_ccache" = "" -a 
"$enable_icecream" != "yes" \); then
 case "%$CC%$CXX%" in
 # If $CC and/or $CXX already contain "ccache" (possibly suffixed with some 
version number etc),
@@ -2984,7 +3001,8 @@ if test "$enable_ccache" = "nodepend"; then
 fi
 AC_SUBST(CCACHE_DEPEND_MODE)
 
-if test "$CCACHE" != ""; then
+# skip on windows - sccache defaults are good enough
+if test "$CCACHE" != "" -a "$_os" != "WINNT"; then
 ccache_size_msg=$([ccache -s | tail -n 1 | sed 's/^[^0-9]*//' | sed -e 
's/\.[0-9]*//'])
 ccache_size=$(echo "$ccache_size_msg" | grep "G" | sed -e 's/G.*$//')
 if test "$ccache_size" = ""; then
@@ -4141,6 +4159,7 @@ AC_SUBST(SHOWINCLUDES_PREFIX)
 #
 # prefix C with ccache if needed
 #
+UNCACHED_CC="$CC"
 if test "$CCACHE" != ""; then
 AC_MSG_CHECKING([whether $CC_BASE is already ccached])
 
@@ -4151,7 +4170,7 @@ if test "$CCACHE" != ""; then
 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])],
   [use_ccache=yes], [use_ccache=no])
 CFLAGS=$save_CFLAGS
-if test $use_ccache = yes; then
+if test $use_ccache = yes -a "${CCACHE/*sccache*/}" != ""; then
 AC_MSG_RESULT([yes])
 else
 CC="$CCACHE $CC"
@@ -6584,6 +6603,7 @@ AC_SUBST(BOOST_CXXFLAGS)
 #
 # prefx CXX with ccache if needed
 #
+UNCACHED_CXX="$CXX"
 if test "$CCACHE" != ""; then
 AC_MSG_CHECKING([whether $CXX_BASE is already ccached])
 AC_LANG_PUSH([C++])
@@ -6592,7 +6612,7 @@ if test "$CCACHE" != ""; then
 dnl an empty program will do, we're checking the compiler flags
 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])],
   [use_ccache=yes], [use_ccache=no])
-if test $use_ccache = yes; then
+if test $use_ccache = yes -a "${CCACHE/*sccache*/}" != ""; then
 AC_MSG_RESULT([yes])
 else
 CXX="$CCACHE $CXX"
@@ -8021,6 +8041,7 @@ AC_SUBST(MSVC_DLL_PATH)
 AC_SUBST(MSVC_DLLS)
 AC_SUBST(MSM_PATH)
 
+
 dnl ===
 dnl Checks for Java
 dnl ===
@@ -11966,6 

[Libreoffice-commits] core.git: config_host.mk.in configure.ac solenv/gbuild

[Stephan Bergmann (via logerrit)]

 config_host.mk.in  |1 
 configure.ac   |   49 +
 solenv/gbuild/platform/com_GCC_defs.mk |7 ++--
 3 files changed, 54 insertions(+), 3 deletions(-)

New commits:
commit 0e90358490fd90a2b45917dd4b076e97082e8fdf
Author: Stephan Bergmann 
AuthorDate: Wed Feb 17 08:21:50 2021 +0100
Commit: Stephan Bergmann 
CommitDate: Wed Feb 17 14:17:12 2021 +0100

More targeted suppression of bogus GCC -Werror=stringop-overflow=

...given that 
"[8/9/10/11 Regression] -Wstringop-overflow false positive due to using 
MEM_REF
type of " is declared fixed now on GCC 11 trunk.

(Moving -Wno-stringop-overflow from gb_CFLAGS_WERROR to gb_CXXFLAGS_COMMON 
is
done for no other reason than to harmonize this with the code for the 
similar
HAVE_BROKEN_GCC_WMAYBE_UNINITIALIZED.)

Change-Id: I3468138c9bbda28f754d4162cb9c059796bd3932
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111029
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/config_host.mk.in b/config_host.mk.in
index fb64c61e66f7..c6c9b7eae351 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -259,6 +259,7 @@ export GTK3_LIBS=$(gb_SPACE)@GTK3_LIBS@
 export USING_X11=@USING_X11@
 export HAMCREST_JAR=@HAMCREST_JAR@
 export 
HAVE_BROKEN_GCC_WMAYBE_UNINITIALIZED=@HAVE_BROKEN_GCC_WMAYBE_UNINITIALIZED@
+export HAVE_BROKEN_GCC_WSTRINGOP_OVERFLOW=@HAVE_BROKEN_GCC_WSTRINGOP_OVERFLOW@
 export 
HAVE_CLANG_DEBUG_INFO_KIND_CONSTRUCTOR=@HAVE_CLANG_DEBUG_INFO_KIND_CONSTRUCTOR@
 export HAVE_GCC_AVX=@HAVE_GCC_AVX@
 export HAVE_GCC_BUILTIN_ATOMIC=@HAVE_GCC_BUILTIN_ATOMIC@
diff --git a/configure.ac b/configure.ac
index 78bb7998e62c..c3e15f6397de 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7343,6 +7343,55 @@ if test "$GCC" = yes && test "$COM_IS_CLANG" != TRUE; 
then
 fi
 AC_SUBST([HAVE_BROKEN_GCC_WMAYBE_UNINITIALIZED])
 
+dnl Check for  
"[8/9/10/11 Regression]
+dnl -Wstringop-overflow false positive due to using MEM_REF type of " 
(fixed in GCC 11), which
+dnl hits us e.g. with GCC 10 and --enable-optimized at
+dnl
+dnl   In file included from include/rtl/string.hxx:49,
+dnlfrom include/rtl/ustring.hxx:43,
+dnlfrom include/osl/file.hxx:35,
+dnlfrom include/codemaker/global.hxx:28,
+dnlfrom include/codemaker/options.hxx:23,
+dnlfrom codemaker/source/commoncpp/commoncpp.cxx:24:
+dnl   In function ‘char* rtl::addDataHelper(char*, const char*, std::size_t)’,
+dnl   inlined from ‘static char* rtl::ToStringHelper::addData(char*, const char*) [with long unsigned int N = 3]’ at 
include/rtl/stringconcat.hxx:147:85,
+dnl   inlined from ‘char* rtl::OStringConcat::addData(char*) const 
[with T1 = const char [3]; T2 = rtl::OString]’ at 
include/rtl/stringconcat.hxx:226:103,
+dnl   inlined from ‘rtl::OStringBuffer& 
rtl::OStringBuffer::append(rtl::OStringConcat&&) [with T1 = const char 
[3]; T2 = rtl::OString]’ at include/rtl/strbuf.hxx:599:30,
+dnl   inlined from ‘rtl::OString codemaker::cpp::scopedCppName(const 
rtl::OString&, bool)’ at codemaker/source/commoncpp/commoncpp.cxx:53:55:
+dnl   include/rtl/stringconcat.hxx:78:15: error: writing 2 bytes into a region 
of size 1 [-Werror=stringop-overflow=]
+dnl  78 | memcpy( buffer, data, length );
+dnl | ~~^~~~
+HAVE_BROKEN_GCC_WSTRINGOP_OVERFLOW=
+if test "$GCC" = yes && test "$COM_IS_CLANG" != TRUE; then
+AC_MSG_CHECKING([whether $CXX_BASE might report false 
-Werror=stringop-overflow=])
+AC_LANG_PUSH([C++])
+save_CXXFLAGS=$CXXFLAGS
+CXXFLAGS="$CXXFLAGS $CXXFLAGS_CXX11 -Werror -Wstringop-overflow"
+if test "$ENABLE_OPTIMIZED" = TRUE; then
+CXXFLAGS="$CXXFLAGS -O2"
+else
+CXXFLAGS="$CXXFLAGS -O0"
+fi
+dnl Test code taken from 
:
+AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
+void fill(char const * begin, char const * end, char c);
+struct q {
+char ids[4];
+char username[6];
+};
+void test(q & c) {
+fill(c.ids, c.ids + sizeof(c.ids), '\0');
+__builtin_strncpy(c.username, "root", sizeof(c.username));
+}
+]])], [AC_MSG_RESULT([no])], [
+HAVE_BROKEN_GCC_WSTRINGOP_OVERFLOW=TRUE
+AC_MSG_RESULT([yes])
+])
+CXXFLAGS=$save_CXXFLAGS
+AC_LANG_POP([C++])
+fi
+AC_SUBST([HAVE_BROKEN_GCC_WSTRINGOP_OVERFLOW])
+
 dnl ===
 dnl CPU Intrinsics support - SSE, AVX
 dnl ===
diff --git a/solenv/gbuild/platform/com_GCC_defs.mk 

[Libreoffice-commits] core.git: config_host.mk.in configure.ac solenv/gbuild

[Luboš Luňák (via logerrit)]

 config_host.mk.in   |1 +
 configure.ac|   16 
 solenv/gbuild/platform/com_GCC_class.mk |   11 +++
 3 files changed, 24 insertions(+), 4 deletions(-)

New commits:
commit d60dc145adf15cf9d06ea191dfd4b2f4c5c3fc33
Author: Luboš Luňák 
AuthorDate: Fri Jul 17 12:05:58 2020 +0200
Commit: Luboš Luňák 
CommitDate: Fri Jul 17 13:30:55 2020 +0200

use Clang11's -fpch-instantiate-templates if available

The optimization to instantiate templates already while creating
the PCH instead for every single compilation has been finally
accepted upstream, but it's opt-in.

Change-Id: Ia6456df05512329fc594f9ed0e400250c4f5029e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98948
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 

diff --git a/config_host.mk.in b/config_host.mk.in
index 5b50b6f8ebe2..f0383acb318d 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -463,6 +463,7 @@ export PATH=@LO_PATH@
 export LIBO_PATH_SEPARATOR=@P_SEP@
 export PAGEMAKER_CFLAGS=$(gb_SPACE)@PAGEMAKER_CFLAGS@
 export PAGEMAKER_LIBS=$(gb_SPACE)@PAGEMAKER_LIBS@
+export PCH_INSTANTIATE_TEMPLATES=@PCH_INSTANTIATE_TEMPLATES@
 export PCH_MODULES_CODEGEN=@PCH_MODULES_CODEGEN@
 export PCH_MODULES_DEBUGINFO=@PCH_MODULES_DEBUGINFO@
 export PERL=@PERL@
diff --git a/configure.ac b/configure.ac
index 7dae274f3e43..9e206cc303d0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5317,6 +5317,22 @@ if test -n "$ENABLE_PCH" -a -n "$CCACHE_DEPEND_MODE" -a 
"$GCC" = "yes" -a "$COM_
 fi
 fi
 
+PCH_INSTANTIATE_TEMPLATES=
+if test -n "$ENABLE_PCH"; then
+AC_MSG_CHECKING([whether $CC supports -fpch-instantiate-templates])
+save_CFLAGS=$CFLAGS
+CFLAGS="$CFLAGS -Werror -fpch-instantiate-templates"
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[ return 0; ]])],[ 
PCH_INSTANTIATE_TEMPLATES="-fpch-instantiate-templates" ],[])
+CFLAGS=$save_CFLAGS
+if test -n "$PCH_INSTANTIATE_TEMPLATES"; then
+AC_MSG_RESULT(yes)
+else
+AC_MSG_RESULT(no)
+fi
+CFLAGS=$save_CFLAGS
+fi
+AC_SUBST(PCH_INSTANTIATE_TEMPLATES)
+
 BUILDING_PCH_WITH_OBJ=
 if test -n "$ENABLE_PCH"; then
 AC_MSG_CHECKING([whether $CC supports -Xclang -building-pch-with-obj])
diff --git a/solenv/gbuild/platform/com_GCC_class.mk 
b/solenv/gbuild/platform/com_GCC_class.mk
index d19f0d3686ad..93f750c4ce56 100644
--- a/solenv/gbuild/platform/com_GCC_class.mk
+++ b/solenv/gbuild/platform/com_GCC_class.mk
@@ -101,21 +101,24 @@ gb_PrecompiledHeader_get_enableflags = \
 gb_PrecompiledHeader_EXT := .gch
 endif
 
+gb_PrecompiledHeader_extra_pch_cxxflags += $(PCH_INSTANTIATE_TEMPLATES)
+
 # Clang supports building extra object file where it puts code that would be 
shared by all users of the PCH.
 # Unlike with MSVC it is built as a separate step. The relevant options are 
used only when generating the PCH
 # and when creating the PCH's object file, normal compilations using the PCH 
do not need extra options.
-gb_PrecompiledHeader_pch_with_obj = $(BUILDING_PCH_WITH_OBJ)
+gb_PrecompiledHeader_pch_with_obj += $(BUILDING_PCH_WITH_OBJ)
+gb_PrecompiledHeader_extra_pch_cxxflags += $(BUILDING_PCH_WITH_OBJ)
 ifneq ($(BUILDING_PCH_WITH_OBJ),)
 # If using Clang's PCH extra object, we may need to strip unused sections, 
otherwise inline and template functions
 # emitted in that object may in some cases cause unresolved references to 
private symbols in other libraries.
 gb_LinkTarget_LDFLAGS += $(LD_GC_SECTIONS)
 gb_PrecompiledHeader_pch_with_obj += -ffunction-sections -fdata-sections
 # Enable generating more shared code and debuginfo in the PCH object file.
-gb_PrecompiledHeader_pch_with_obj += $(PCH_MODULES_DEBUGINFO)
+gb_PrecompiledHeader_extra_pch_cxxflags += $(PCH_MODULES_DEBUGINFO)
 ifeq ($(ENABLE_OPTIMIZED),)
 # -fmodules-codegen appears to be worth it only if not optimizing, otherwise 
optimizing all the functions emitted
 # in the PCH object file may take way too long, especially given that many of 
those may get thrown away
-gb_PrecompiledHeader_pch_with_obj += $(PCH_MODULES_CODEGEN)
+gb_PrecompiledHeader_extra_pch_cxxflags += $(PCH_MODULES_CODEGEN)
 endif
 endif
 
@@ -138,7 +141,7 @@ $(call gb_Helper_abbreviate_dirs,\
$(if $(VISIBILITY),,$(gb_VISIBILITY_FLAGS)) \
$(if 
$(EXTERNAL_CODE),$(gb_CXXFLAGS_Wundef),$(gb_DEFS_INTERNAL)) \
$(gb_NO_PCH_TIMESTAMP) \
-   $(gb_PrecompiledHeader_pch_with_obj) \
+   $(gb_PrecompiledHeader_extra_pch_cxxflags) \
$(6) \
$(call gb_cxx_dep_generation_options,$(1),$(call 
gb_PrecompiledHeader_get_dep_target_tmp,$(2),$(7))) \
-c $(patsubst %.cxx,%.hxx,$(3)) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: config_host.mk.in configure.ac solenv/gbuild

[Luboš Luňák (via logerrit)]

 config_host.mk.in  |1 +
 configure.ac   |   13 +
 solenv/gbuild/platform/com_GCC_defs.mk |4 
 3 files changed, 18 insertions(+)

New commits:
commit 2d1f1a1c849fd4f2c7f1211f8d3f03aec069bd44
Author: Luboš Luňák 
AuthorDate: Sun Jan 19 20:11:15 2020 +0100
Commit: Luboš Luňák 
CommitDate: Tue May 26 10:37:00 2020 +0200

use -Xclang -debug-info-kind=constructor if available

The option, available since Clang10, emits debuginfo for classes
with explicit ctors only together with the ctor, which avoids
redundant debuginfo for such classes, noticeably saving both build
time and disk space. https://reviews.llvm.org/D72427

I've been using this for quite some time, without problems.

Change-Id: I24e5339f983cb8d8990185436dd63e00f0d3ce60
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94756
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 

diff --git a/config_host.mk.in b/config_host.mk.in
index bcce45b1ce77..f59b51d8f652 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -271,6 +271,7 @@ export GTK3_LIBS=$(gb_SPACE)@GTK3_LIBS@
 export USING_X11=@USING_X11@
 export HAMCREST_JAR=@HAMCREST_JAR@
 export 
HAVE_BROKEN_GCC_WMAYBE_UNINITIALIZED=@HAVE_BROKEN_GCC_WMAYBE_UNINITIALIZED@
+export 
HAVE_CLANG_DEBUG_INFO_KIND_CONSTRUCTOR=@HAVE_CLANG_DEBUG_INFO_KIND_CONSTRUCTOR@
 export HAVE_GCC_AVX=@HAVE_GCC_AVX@
 export HAVE_GCC_BUILTIN_ATOMIC=@HAVE_GCC_BUILTIN_ATOMIC@
 export HAVE_GCC_FNO_ENFORCE_EH_SPECS=@HAVE_GCC_FNO_ENFORCE_EH_SPECS@
diff --git a/configure.ac b/configure.ac
index 8f9e1c71047a..ba2a2d0ea3ee 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4098,6 +4098,19 @@ if test "$enable_split_debug" != no; then
 fi
 AC_SUBST(HAVE_GCC_SPLIT_DWARF)
 
+HAVE_CLANG_DEBUG_INFO_KIND_CONSTRUCTOR=
+AC_MSG_CHECKING([whether $CC_BASE supports -Xclang 
-debug-info-kind=constructor])
+save_CFLAGS=$CFLAGS
+CFLAGS="$CFLAGS -Werror -Xclang -debug-info-kind=constructor"
+AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[ return 0; ]])],[ 
HAVE_CLANG_DEBUG_INFO_KIND_CONSTRUCTOR=TRUE ],[])
+CFLAGS=$save_CFLAGS
+if test "$HAVE_CLANG_DEBUG_INFO_KIND_CONSTRUCTOR" = "TRUE"; then
+AC_MSG_RESULT([yes])
+else
+AC_MSG_RESULT([no])
+fi
+AC_SUBST(HAVE_CLANG_DEBUG_INFO_KIND_CONSTRUCTOR)
+
 ENABLE_GDB_INDEX=
 if test "$enable_gdb_index" != "no"; then
 dnl Currently by default enabled only on Linux, feel free to set 
test_gdb_index above also for other platforms.
diff --git a/solenv/gbuild/platform/com_GCC_defs.mk 
b/solenv/gbuild/platform/com_GCC_defs.mk
index 4d3602864bc8..1707a7481ee6 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -221,6 +221,10 @@ ifeq ($(HAVE_GCC_SPLIT_DWARF),TRUE)
 gb_DEBUGINFO_FLAGS+=-gsplit-dwarf
 endif
 
+ifeq ($(HAVE_CLANG_DEBUG_INFO_KIND_CONSTRUCTOR),TRUE)
+gb_DEBUGINFO_FLAGS+=-Xclang -debug-info-kind=constructor
+endif
+
 ifeq ($(ENABLE_GDB_INDEX),TRUE)
 gb_LINKER_DEBUGINFO_FLAGS += -Wl,--gdb-index
 gb_DEBUGINFO_FLAGS += -ggnu-pubnames
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: config_host.mk.in configure.ac solenv/gbuild

[Luboš Luňák (via logerrit)]

 config_host.mk.in  |1 +
 configure.ac   |   30 ++
 solenv/gbuild/LinkTarget.mk|6 +-
 solenv/gbuild/platform/com_GCC_defs.mk |1 +
 solenv/gbuild/platform/com_MSC_defs.mk |1 +
 5 files changed, 34 insertions(+), 5 deletions(-)

New commits:
commit e957382700ed9237d4a7b374cd76bec466f5231c
Author: Luboš Luňák 
AuthorDate: Tue Feb 18 10:20:38 2020 +0100
Commit: Luboš Luňák 
CommitDate: Wed Feb 19 10:27:43 2020 +0100

add --enable-optimized=debug

This will use -Og with GCC/Clang instead of -O0, which should make
unittests run faster without (hopefully) breaking anything related
to debugging. This is primarily meant to Jenkins builds, where
debug info is rarely needed (backtraces for unittest crashes AFAICT).

This can be also used to make LO itself run faster when developing,
but I personally do not find it worth it (with Clang and full PCH
this makes starmath build take about 70% longer, although presumably
for non-PCH builds the relative increase will be smaller).

Change-Id: I198d0759ebca94c90be662e02e0f1281a24d1d70
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88917
Reviewed-by: Michael Stahl 
Reviewed-by: Luboš Luňák 
Tested-by: Jenkins

diff --git a/config_host.mk.in b/config_host.mk.in
index 64a1a6627386..9e8b0c2304e9 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -177,6 +177,7 @@ export ENABLE_OOENV=@ENABLE_OOENV@
 export ENABLE_OPENGL_TRANSITIONS=@ENABLE_OPENGL_TRANSITIONS@
 export ENABLE_OPENGL_CANVAS=@ENABLE_OPENGL_CANVAS@
 export ENABLE_OPTIMIZED=@ENABLE_OPTIMIZED@
+export ENABLE_OPTIMIZED_DEBUG=@ENABLE_OPTIMIZED_DEBUG@
 export ENABLE_PCH=@ENABLE_PCH@
 export ENABLE_PDFIMPORT=@ENABLE_PDFIMPORT@
 export ENABLE_PDFIUM=@ENABLE_PDFIUM@
diff --git a/configure.ac b/configure.ac
index 60ece7a9af17..0b728af2e5fb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1194,10 +1194,11 @@ libo_FUZZ_ARG_ENABLE(symbols,
  Example: --enable-symbols="all -sw/ -Library_sc".]))
 
 libo_FUZZ_ARG_ENABLE(optimized,
-AS_HELP_STRING([--disable-optimized],
+AS_HELP_STRING([--enable-optimized=],
 [Whether to compile with optimization flags.
  By default, disabled for --enable-debug and --enable-dbgutil, enabled
- otherwise.]))
+ otherwise. Using 'debug' will try to use only optimizations that 
should
+ not interfere with debugging.]))
 
 libo_FUZZ_ARG_ENABLE(runtime-optimizations,
 AS_HELP_STRING([--disable-runtime-optimizations],
@@ -4204,6 +4205,8 @@ if test -n "$with_android_ndk" -a \( -n "$ENABLE_SYMBOLS" 
-o -n "$ENABLE_DEBUG"
 fi
 fi
 
+ENABLE_OPTIMIZED=
+ENABLE_OPTIMIZED_DEBUG=
 AC_MSG_CHECKING([whether to compile with optimization flags])
 if test -z "$enable_optimized"; then
 if test -n "$ENABLE_DEBUG$ENABLE_DBGUTIL"; then
@@ -4212,14 +4215,33 @@ if test -z "$enable_optimized"; then
 enable_optimized=yes
 fi
 fi
-if test "$enable_optimized" != no; then
+if test "$enable_optimized" = yes; then
 ENABLE_OPTIMIZED=TRUE
 AC_MSG_RESULT([yes])
+elif test "$enable_optimized" = debug; then
+ENABLE_OPTIMIZED_DEBUG=TRUE
+AC_MSG_RESULT([yes (debug)])
+HAVE_GCC_OG=
+if test "$GCC" = "yes"; then
+AC_MSG_CHECKING([whether $CC_BASE supports -Og])
+save_CFLAGS=$CFLAGS
+CFLAGS="$CFLAGS -Werror -Og"
+AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[ return 0; ]])],[ 
HAVE_GCC_OG=TRUE ],[])
+CFLAGS=$save_CFLAGS
+if test "$HAVE_GCC_OG" = "TRUE"; then
+AC_MSG_RESULT([yes])
+else
+AC_MSG_RESULT([no])
+fi
+fi
+if test -z "$HAVE_GCC_OG"; then
+AC_MSG_ERROR([The compiler does not support optimizations suitable for 
debugging.])
+fi
 else
-ENABLE_OPTIMIZED=
 AC_MSG_RESULT([no])
 fi
 AC_SUBST(ENABLE_OPTIMIZED)
+AC_SUBST(ENABLE_OPTIMIZED_DEBUG)
 
 #
 # determine CPUNAME, OS, ...
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 914c36d35cd2..9e14f599b690 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -44,7 +44,11 @@ gb_LinkTarget__symbols_enabled = \
 $(filter $(1),$(ENABLE_SYMBOLS_FOR
 
 # debug flags, if the LinkTarget is named in the list of libraries of 
ENABLE_SYMBOLS_FOR
-gb_LinkTarget__get_debugflags=$(if 
$(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS)) $(if 
$(call gb_LinkTarget__symbols_enabled,$(1)),$(gb_DEBUGINFO_FLAGS))
+gb_LinkTarget__get_debugflags= \
+$(if $(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS), \
+$(if $(ENABLE_OPTIMIZED_DEBUG),$(gb_COMPILERDEBUGOPTFLAGS), \
+$(gb_COMPILERNOOPTFLAGS))) \
+$(if $(call gb_LinkTarget__symbols_enabled,$(1)),$(gb_DEBUGINFO_FLAGS))
 
 # similar for LDFLAGS, use linker optimization flags in non-debug case,
 # but moreover strip debug from libraries for which debuginfo is not wanted
diff --git 

[Libreoffice-commits] core.git: config_host.mk.in configure.ac solenv/gbuild

[Luboš Luňák (via logerrit)]

 config_host.mk.in   |1 +
 configure.ac|   23 +++
 solenv/gbuild/platform/com_GCC_class.mk |2 +-
 3 files changed, 25 insertions(+), 1 deletion(-)

New commits:
commit 4a93a7954e49b42b0e23a9ca8d962b6d4614b005
Author: Luboš Luňák 
AuthorDate: Sat Jan 18 15:44:45 2020 +0100
Commit: Luboš Luňák 
CommitDate: Sat Jan 18 16:55:55 2020 +0100

use -Wl,-dead_strip on Mac, its linker doesn't know -Wl,--gc-sections

Change-Id: Ic69d0030a46fe4753cc75da58bb2c15cf009b135
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87023
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 

diff --git a/config_host.mk.in b/config_host.mk.in
index 2c5eec97a156..88a529da664a 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -318,6 +318,7 @@ export KF5_LIBS=$(gb_SPACE)@KF5_LIBS@
 export KRB5_LIBS=@KRB5_LIBS@
 export LCMS2_CFLAGS=$(gb_SPACE)@LCMS2_CFLAGS@
 export LCMS2_LIBS=$(gb_SPACE)@LCMS2_LIBS@
+export LD_GC_SECTIONS=@LD_GC_SECTIONS@
 export LD_PLUGIN=@LD_PLUGIN@
 @x_LDFLAGS@ export LDFLAGS=@LDFLAGS@
 export LFS_CFLAGS=@LFS_CFLAGS@
diff --git a/configure.ac b/configure.ac
index 5b9fd601ef9e..5c1dc1e5f919 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4062,6 +4062,29 @@ printf ("hello world\n");
 fi
 AC_SUBST(HAVE_LD_BSYMBOLIC_FUNCTIONS)
 
+LD_GC_SECTIONS=
+if test "$GCC" = "yes"; then
+for flag in "--gc-sections" "-dead_strip"; do
+AC_MSG_CHECKING([for $flag linker support])
+ldflags_save=$LDFLAGS
+LDFLAGS="$LDFLAGS -Wl,$flag"
+AC_LINK_IFELSE([AC_LANG_PROGRAM([
+#include 
+],[
+printf ("hello world\n");
+])],[
+LD_GC_SECTIONS="-Wl,$flag"
+AC_MSG_RESULT( found )
+], [
+AC_MSG_RESULT( not found )
+])
+LDFLAGS=$ldflags_save
+if test -n "$LD_GC_SECTIONS"; then
+break
+fi
+done
+fi
+AC_SUBST(LD_GC_SECTIONS)
 
 HAVE_GSPLIT_DWARF=
 if test "$enable_split_debug" != no; then
diff --git a/solenv/gbuild/platform/com_GCC_class.mk 
b/solenv/gbuild/platform/com_GCC_class.mk
index f40d315b1c3b..12ae0a21537e 100644
--- a/solenv/gbuild/platform/com_GCC_class.mk
+++ b/solenv/gbuild/platform/com_GCC_class.mk
@@ -95,7 +95,7 @@ gb_PrecompiledHeader_pch_with_obj = $(BUILDING_PCH_WITH_OBJ)
 ifneq ($(BUILDING_PCH_WITH_OBJ),)
 # If using Clang's PCH extra object, we may need to strip unused sections, 
otherwise inline and template functions
 # emitted in that object may in some cases cause unresolved references to 
private symbols in other libraries.
-gb_LinkTarget_LDFLAGS += -Wl,--gc-sections
+gb_LinkTarget_LDFLAGS += $(LD_GC_SECTIONS)
 gb_PrecompiledHeader_pch_with_obj += -ffunction-sections -fdata-sections
 # Enable generating more shared code and debuginfo in the PCH object file.
 gb_PrecompiledHeader_pch_with_obj += $(PCH_MODULES_DEBUGINFO)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: config_host.mk.in configure.ac solenv/gbuild

[Luboš Luňák (via logerrit)]

 config_host.mk.in   |2 ++
 configure.ac|   31 +++
 solenv/gbuild/platform/com_GCC_class.mk |   16 +++-
 3 files changed, 48 insertions(+), 1 deletion(-)

New commits:
commit a0323937ff4b36594e26b5c1a143af188c75abfc
Author: Luboš Luňák 
AuthorDate: Sat Jun 22 21:17:56 2019 +0200
Commit: Luboš Luňák 
CommitDate: Sat Jan 18 14:56:37 2020 +0100

support Clang's -fmodules-codegen/debuginfo options for PCH building

These (starting with my patches for Clang-to-be-10) allowing emitting
debuginfo and functions into a dedicated object file, so that all
the normal compilations using the PCH can skip those, thus saving
the time. The debuginfo option seems to always be worth it. The codegen
option is more tricky, it doesn't seem to be worth it for optimized
builds (optimizing all the functions in that one object file costs
too much).

This requires also using --Wl,--gc-sections . The reason is that
the object file contains all template instances instantiated from the PCH,
so that they can be shared, but the template instance may come
from another library or use a private symbol from that library.
For example the std::unique_ptr
in ScInterpreterContextPool in the header refers to ScInterpreterContext
dtor. But even though both these classes are private, the header
gets used also by scfilt, because there it is included by document.hxx
because of a private ScDocument data member. So even though nothing
in scfilt uses ScInterpreterContext, the PCH object file will refer to it.
Fortunately that template instance itself is not used by scfilt,
so --gc-sections will remove it.

Change-Id: I2a06ebcc4dd4175424b3a72ab3ebcaf2ac3ee295
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87011
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 

diff --git a/config_host.mk.in b/config_host.mk.in
index e1cddb295964..2c5eec97a156 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -448,6 +448,8 @@ export PATH=@LO_PATH@
 export LIBO_PATH_SEPARATOR=@P_SEP@
 export PAGEMAKER_CFLAGS=$(gb_SPACE)@PAGEMAKER_CFLAGS@
 export PAGEMAKER_LIBS=$(gb_SPACE)@PAGEMAKER_LIBS@
+export PCH_MODULES_CODEGEN=@PCH_MODULES_CODEGEN@
+export PCH_MODULES_DEBUGINFO=@PCH_MODULES_DEBUGINFO@
 export PERL=@PERL@
 export PKGFORMAT=@PKGFORMAT@
 export PKGMK=@PKGMK@
diff --git a/configure.ac b/configure.ac
index 1f7eb690b6cc..5b9fd601ef9e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5202,6 +5202,37 @@ if test -n "$ENABLE_PCH"; then
 fi
 AC_SUBST(BUILDING_PCH_WITH_OBJ)
 
+PCH_MODULES_CODEGEN=
+if test -n "$BUILDING_PCH_WITH_OBJ"; then
+AC_MSG_CHECKING([whether $CC supports -Xclang -fmodules-codegen])
+save_CFLAGS=$CFLAGS
+CFLAGS="$CFLAGS -Werror -Xclang -fmodules-codegen"
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[ return 0; ]])],[ 
PCH_MODULES_CODEGEN="-Xclang -fmodules-codegen" ],[])
+CFLAGS=$save_CFLAGS
+if test -n "$PCH_MODULES_CODEGEN"; then
+AC_MSG_RESULT(yes)
+else
+AC_MSG_RESULT(no)
+fi
+CFLAGS=$save_CFLAGS
+fi
+AC_SUBST(PCH_MODULES_CODEGEN)
+PCH_MODULES_DEBUGINFO=
+if test -n "$BUILDING_PCH_WITH_OBJ"; then
+AC_MSG_CHECKING([whether $CC supports -Xclang -fmodules-debuginfo])
+save_CFLAGS=$CFLAGS
+CFLAGS="$CFLAGS -Werror -Xclang -fmodules-debuginfo"
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[ return 0; ]])],[ 
PCH_MODULES_DEBUGINFO="-Xclang -fmodules-debuginfo" ],[])
+CFLAGS=$save_CFLAGS
+if test -n "$PCH_MODULES_DEBUGINFO"; then
+AC_MSG_RESULT(yes)
+else
+AC_MSG_RESULT(no)
+fi
+CFLAGS=$save_CFLAGS
+fi
+AC_SUBST(PCH_MODULES_DEBUGINFO)
+
 TAB=`printf '\t'`
 
 AC_MSG_CHECKING([the GNU Make version])
diff --git a/solenv/gbuild/platform/com_GCC_class.mk 
b/solenv/gbuild/platform/com_GCC_class.mk
index 2ec7a66f3e25..f40d315b1c3b 100644
--- a/solenv/gbuild/platform/com_GCC_class.mk
+++ b/solenv/gbuild/platform/com_GCC_class.mk
@@ -89,8 +89,22 @@ gb_PrecompiledHeader_EXT := .gch
 endif
 
 # Clang supports building extra object file where it puts code that would be 
shared by all users of the PCH.
-# Unlike with MSVC it is built as a separate step.
+# Unlike with MSVC it is built as a separate step. The relevant options are 
used only when generating the PCH
+# and when creating the PCH's object file, normal compilations using the PCH 
do not need extra options.
 gb_PrecompiledHeader_pch_with_obj = $(BUILDING_PCH_WITH_OBJ)
+ifneq ($(BUILDING_PCH_WITH_OBJ),)
+# If using Clang's PCH extra object, we may need to strip unused sections, 
otherwise inline and template functions
+# emitted in that object may in some cases cause unresolved references to 
private symbols in other libraries.
+gb_LinkTarget_LDFLAGS += -Wl,--gc-sections
+gb_PrecompiledHeader_pch_with_obj += -ffunction-sections -fdata-sections
+# Enable generating more shared code and debuginfo in the 

[Libreoffice-commits] core.git: config_host.mk.in configure.ac solenv/gbuild

[Mike Kaganski (via logerrit)]

 config_host.mk.in   |1 -
 configure.ac|5 -
 solenv/gbuild/platform/com_MSC_class.mk |4 ++--
 3 files changed, 2 insertions(+), 8 deletions(-)

New commits:
commit 0c0e73584f125025fb17d6be8f8050f3b7649c7d
Author: Mike Kaganski 
AuthorDate: Tue May 7 16:31:10 2019 +0300
Commit: Mike Kaganski 
CommitDate: Tue May 7 19:04:48 2019 +0200

Drop LINK_X64_BINARY: any MSVC linker is suitable for any target platform

Change-Id: I8b080ad44f10e52fa5a726bd7cdf7dd8ff7e2dd4
Reviewed-on: https://gerrit.libreoffice.org/71913
Tested-by: Jenkins 
Reviewed-by: Mike Kaganski 

diff --git a/config_host.mk.in b/config_host.mk.in
index 66cca894d96c..84c75e5e5954 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -368,7 +368,6 @@ export LIBXML_JAR=@LIBXML_JAR@
 export LIBXML_LIBS=$(gb_SPACE)@LIBXML_LIBS@
 export LIBXSLT_CFLAGS=$(gb_SPACE)@LIBXSLT_CFLAGS@
 export LIBXSLT_LIBS=$(gb_SPACE)@LIBXSLT_LIBS@
-export LINK_X64_BINARY=@LINK_X64_BINARY@
 @x_Cygwin@ export LS=@WIN_LS@
 export MACOSX_BUNDLE_IDENTIFIER=@MACOSX_BUNDLE_IDENTIFIER@
 export MACOSX_CODESIGNING_IDENTITY=@MACOSX_CODESIGNING_IDENTITY@
diff --git a/configure.ac b/configure.ac
index 020e3b75ed42..14249897ba02 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3542,7 +3542,6 @@ if test "$_os" = "WINNT"; then
 
 BUILD_X64=
 CXX_X64_BINARY=
-LINK_X64_BINARY=
 
 if test "$BITNESS_OVERRIDE" = ""; then
 AC_MSG_CHECKING([for a x64 compiler and libraries for 64-bit Explorer 
extensions])
@@ -3552,11 +3551,9 @@ if test "$_os" = "WINNT"; then
 if "$VC_PRODUCT_DIR/bin/amd64/cl.exe" -? /dev/null 
2>&1; then
 BUILD_X64=TRUE
 CXX_X64_BINARY="$VC_PRODUCT_DIR/bin/amd64/cl.exe"
-LINK_X64_BINARY="$VC_PRODUCT_DIR/bin/amd64/link.exe"
 elif "$VC_PRODUCT_DIR/bin/x86_amd64/cl.exe" -? /dev/null 2>&1; then
 BUILD_X64=TRUE
 CXX_X64_BINARY="$VC_PRODUCT_DIR/bin/x86_amd64/cl.exe"
-LINK_X64_BINARY="$VC_PRODUCT_DIR/bin/x86_amd64/link.exe"
 fi
 elif test -f 
"$VC_PRODUCT_DIR/Tools/MSVC/$vcbuildnumber/atlmfc/lib/x64/atls.lib" || \
  test -f 
"$VC_PRODUCT_DIR/Tools/MSVC/$vcbuildnumber/atlmfc/lib/spectre/x64/atls.lib"; 
then
@@ -3564,7 +3561,6 @@ if test "$_os" = "WINNT"; then
 if 
"$VC_PRODUCT_DIR/Tools/MSVC/$vcbuildnumber/bin/HostX64/x64/cl.exe" -? 
/dev/null 2>&1; then
 BUILD_X64=TRUE
 
CXX_X64_BINARY="$VC_PRODUCT_DIR/Tools/MSVC/$vcbuildnumber/bin/HostX64/x64/cl.exe"
-
LINK_X64_BINARY="$VC_PRODUCT_DIR/Tools/MSVC/$vcbuildnumber/bin/HostX64/x64/link.exe"
 fi
 fi
 if test "$BUILD_X64" = TRUE; then
@@ -3578,7 +3574,6 @@ if test "$_os" = "WINNT"; then
 
 # These are passed to the environment and then used in 
gbuild/platform/com_MSC_class.mk
 AC_SUBST(CXX_X64_BINARY)
-AC_SUBST(LINK_X64_BINARY)
 
 # Check for 32-bit compiler to use to build the 32-bit TWAIN shim
 # needed to support TWAIN scan on both 32- and 64-bit systems
diff --git a/solenv/gbuild/platform/com_MSC_class.mk 
b/solenv/gbuild/platform/com_MSC_class.mk
index b6e79e83120a..3bf1bdf1a64d 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -168,7 +168,7 @@ $(call gb_Helper_abbreviate_dirs,\
$(PCHOBJS) $(NATIVERES)) && \
$(if $(filter $(call 
gb_Library__get_workdir_linktargetname,merged),$(2)),$(call 
gb_LinkTarget_MergedResponseFile)) \
unset INCLUDE && \
-   $(if $(filter YES,$(LIBRARY_X64)), $(LINK_X64_BINARY), $(gb_LINK)) \
+   $(gb_LINK) \
$(if $(filter Library 
CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \
$(if $(filter StaticLibrary,$(TARGETTYPE)),-LIB) \
$(if $(filter 
Executable,$(TARGETTYPE)),$(gb_Executable_TARGETTYPEFLAGS)) \
@@ -202,7 +202,7 @@ $(call gb_Helper_abbreviate_dirs,\
$(if $(filter Executable,$(TARGETTYPE)),&& mt.exe $(MTFLAGS) -nologo 
-manifest $(SRCDIR)/solenv/gbuild/platform/DeclareDPIAware.manifest 
-updateresource:$(1)\;1 ) \
$(if $(filter Library,$(TARGETTYPE)),&& \
echo $(notdir $(1)) > $(WORKDIR)/LinkTarget/$(2).exports.tmp && 
\
-   $(if $(filter 
YES,$(LIBRARY_X64)),$(LINK_X64_BINARY),$(gb_LINK)) \
+   $(gb_LINK) \
-dump -exports $(ILIBTARGET) \
>> $(WORKDIR)/LinkTarget/$(2).exports.tmp && \
$(call 
gb_Helper_replace_if_different_and_touch,$(WORKDIR)/LinkTarget/$(2).exports.tmp,$(WORKDIR)/LinkTarget/$(2).exports,$(1)))
 \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: config_host.mk.in configure.ac solenv/gbuild

[Libreoffice Gerrit user]

 config_host.mk.in|1 -
 configure.ac |1 -
 solenv/gbuild/platform/macosx.mk |4 
 3 files changed, 6 deletions(-)

New commits:
commit 70970f8b72eddc66693ec28d26c2dc764009d3e3
Author: Stephan Bergmann 
AuthorDate: Fri Nov 23 18:38:30 2018 +0100
Commit: Stephan Bergmann 
CommitDate: Fri Nov 23 23:38:14 2018 +0100

Revert "Do use -O1 for Apple Clang older than 9.1.0"

This reverts commit 55b9706bea5aa9b654ab39bc7d56339422e17087, which is 
obsoleted
by b4f666f2e677b05cab8395fe7972b45b15f60c3f "Bump Xcode baseline to 9.3".

Change-Id: Id2240351ed9495e311d55887b8e34f2aa776ae06
Reviewed-on: https://gerrit.libreoffice.org/63896
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/config_host.mk.in b/config_host.mk.in
index 9ed3802ad761..a095f430464b 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -62,7 +62,6 @@ export CDR_LIBS=$(gb_SPACE)@CDR_LIBS@
 @x_CFLAGS@ export CFLAGS=@CFLAGS@
 export CLANGDIR=@CLANGDIR@
 export CLANGLIBDIR=@CLANGLIBDIR@
-export CLANGVER=@CLANGVER@
 export CLUCENE_CFLAGS=$(gb_SPACE)@CLUCENE_CFLAGS@
 export CLUCENE_LIBS=$(gb_SPACE)@CLUCENE_LIBS@
 export LIBCMIS_CFLAGS=$(gb_SPACE)@LIBCMIS_CFLAGS@
diff --git a/configure.ac b/configure.ac
index cddfd825e4a3..ea2229e3324d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3667,7 +3667,6 @@ if test "$COM_IS_CLANG" = TRUE; then
 AC_DEFINE_UNQUOTED(CLANG_FULL_VERSION,$CLANG_FULL_VERSION)
 fi
 AC_SUBST(COM_IS_CLANG)
-AC_SUBST(CLANGVER)
 
 SHOWINCLUDES_PREFIX=
 if test "$_os" = WINNT; then
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index b8f5335fca7f..d51ce5887956 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -19,10 +19,6 @@
 
 gb_SDKDIR := $(MACOSX_SDK_PATH)
 
-ifeq (PRE_9_1_0,$(shell test $(CLANGVER) -lt 90100 && echo PRE_9_1_0))
-gb_COMPILEROPTFLAGS := -O1
-endif
-
 include $(GBUILDDIR)/platform/com_GCC_defs.mk
 
 # Darwin mktemp -t expects a prefix, not a pattern
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: config_host.mk.in configure.ac solenv/gbuild

[Luboš Luňák]

 config_host.mk.in  |1 +
 configure.ac   |   30 ++
 solenv/gbuild/platform/com_GCC_defs.mk |6 ++
 3 files changed, 37 insertions(+)

New commits:
commit c90312c6d61bfa43c70c9acf1093edd731c5f02a
Author: Luboš Luňák 
Date:   Thu Jun 28 04:10:52 2018 +0200

add --enable-gdb-index for --gdb-index from gold/lld

https://lists.freedesktop.org/archives/libreoffice/2018-June/080437.html

Change-Id: I66904333bf329e804025d4b229a0db573e21c3af
Reviewed-on: https://gerrit.libreoffice.org/56566
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 

diff --git a/config_host.mk.in b/config_host.mk.in
index 0bc686e916da..e53c9a12f8b0 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -130,6 +130,7 @@ export ENABLE_EOT=@ENABLE_EOT@
 export ENABLE_EVOAB2=@ENABLE_EVOAB2@
 export ENABLE_FIREBIRD_SDBC=@ENABLE_FIREBIRD_SDBC@
 export ENABLE_FORMULA_LOGGER=@ENABLE_FORMULA_LOGGER@
+export ENABLE_GDB_INDEX=@ENABLE_GDB_INDEX@
 export ENABLE_GIO=@ENABLE_GIO@
 export ENABLE_GPGMEPP=@ENABLE_GPGMEPP@
 export ENABLE_GSTREAMER_0_10=@ENABLE_GSTREAMER_0_10@
diff --git a/configure.ac b/configure.ac
index ebe5d0c5be9b..3ca4d8e8ab90 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1121,6 +1121,11 @@ libo_FUZZ_ARG_ENABLE(split-debug,
 [Uses split debug information (-gsplit-dwarf compile flag). Saves disk 
space and build time,
  but requires tools that support it (both build tools and 
debuggers).]))
 
+libo_FUZZ_ARG_ENABLE(gdb-index,
+AS_HELP_STRING([--enable-gdb-index],
+[Creates debug information in the gdb index format, which makes gdb 
start faster.
+ Requires the gold or lld linker.]))
+
 libo_FUZZ_ARG_ENABLE(sal-log,
 AS_HELP_STRING([--enable-sal-log],
 [Make SAL_INFO and SAL_WARN calls do something even in a non-debug 
build.]))
@@ -3180,6 +3185,31 @@ printf ("hello world\n");
 fi
 AC_SUBST(USE_LD)
 
+ENABLE_GDB_INDEX=
+if test "$enable_gdb_index" = "yes"; then
+AC_MSG_CHECKING([whether $CC supports -ggnu-pubnames])
+save_CFLAGS=$CFLAGS
+CFLAGS="$CFLAGS -Werror -ggnu-pubnames"
+AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[ return 0; ]])],[ AC_MSG_RESULT( 
yes )],[ AC_MSG_ERROR( no )])
+
+AC_MSG_CHECKING([whether $CC supports -Wl,--gdb-index])
+ldflags_save=$LDFLAGS
+LDFLAGS="$LDFLAGS -Wl,--gdb-index"
+AC_LINK_IFELSE([AC_LANG_PROGRAM([
+#include 
+],[
+printf ("hello world\n");
+])], ENABLE_GDB_INDEX=TRUE, [])
+if test "$ENABLE_GDB_INDEX" = "TRUE"; then
+AC_MSG_RESULT( yes )
+else
+AC_MSG_ERROR( no )
+fi
+CFLAGS=$save_CFLAGS
+LDFLAGS=$ldflags_save
+fi
+AC_SUBST(ENABLE_GDB_INDEX)
+
 HAVE_LD_BSYMBOLIC_FUNCTIONS=
 if test "$GCC" = "yes"; then
 AC_MSG_CHECKING([for -Bsymbolic-functions linker support])
diff --git a/solenv/gbuild/platform/com_GCC_defs.mk 
b/solenv/gbuild/platform/com_GCC_defs.mk
index c9cbe0d96a54..25bb4bdf6889 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -81,6 +81,12 @@ gb_CXXFLAGS_COMMON := \
 
 gb_CXXFLAGS_Wundef = -Wno-undef
 
+ifeq ($(ENABLE_GDB_INDEX),TRUE)
+gb_LinkTarget_LDFLAGS += -Wl,--gdb-index
+gb_CFLAGS_COMMON += -ggnu-pubnames
+gb_CXXFLAGS_COMMON += -ggnu-pubnames
+endif
+
 ifeq ($(strip $(gb_GCOV)),YES)
 gb_CFLAGS_COMMON += -fprofile-arcs -ftest-coverage
 gb_CXXFLAGS_COMMON += -fprofile-arcs -ftest-coverage
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: config_host.mk.in configure.ac solenv/gbuild

[Luboš Luňák]

 config_host.mk.in  |1 +
 configure.ac   |   28 
 solenv/gbuild/platform/com_GCC_defs.mk |4 
 3 files changed, 33 insertions(+)

New commits:
commit d0cb2967aa288852561497537327ebea838ebc9a
Author: Luboš Luňák 
Date:   Mon Jun 25 22:42:56 2018 +0200

add configure option --enable-ld to use GNU gold or LLVM lld

https://lists.freedesktop.org/archives/libreoffice/2018-June/080437.html

Change-Id: I06214459fcebe5cc58fd7979f3cbe5ac3d97db7d
Reviewed-on: https://gerrit.libreoffice.org/56417
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 

diff --git a/config_host.mk.in b/config_host.mk.in
index acca001c0bcd..0bc686e916da 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -601,6 +601,7 @@ export UCRTSDKDIR=@UCRTSDKDIR@
 export UCRTVERSION=@UCRTVERSION@
 export UCRT_REDISTDIR=@UCRT_REDISTDIR@
 export UNOWINREG_DLL=@UNOWINREG_DLL@
+export USE_LD=@USE_LD@
 export USE_LIBRARY_BIN_TAR=@USE_LIBRARY_BIN_TAR@
 export USE_XINERAMA=@USE_XINERAMA@
 export UPDATE_CONFIG=@UPDATE_CONFIG@
diff --git a/configure.ac b/configure.ac
index 12516d80219b..ebe5d0c5be9b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1341,6 +1341,11 @@ AC_ARG_ENABLE(icecream,
  wrappers, you can override that using --with-gcc-home=/the/path 
switch.]),
 ,)
 
+AC_ARG_ENABLE(ld,
+AS_HELP_STRING([--enable-ld=],
+[Use the specified linker. Both 'gold' and 'lld' linkers generally use 
less memory and link faster.]),
+,)
+
 libo_FUZZ_ARG_ENABLE(cups,
 AS_HELP_STRING([--disable-cups],
 [Do not build cups support.])
@@ -3152,6 +3157,29 @@ else
 fi
 AC_SUBST(CROSS_COMPILING)
 
+USE_LD=
+if test -n "$enable_ld" -a "$enable_ld" != "no"; then
+AC_MSG_CHECKING([for -fuse-ld=$enable_ld linker support])
+if test "$GCC" = "yes"; then
+ldflags_save=$LDFLAGS
+LDFLAGS="$LDFLAGS -fuse-ld=$enable_ld"
+AC_LINK_IFELSE([AC_LANG_PROGRAM([
+#include 
+],[
+printf ("hello world\n");
+])], USE_LD=$enable_ld, [])
+if test -n "$USE_LD"; then
+AC_MSG_RESULT( yes )
+LDFLAGS="$ldflags_save -fuse-ld=$enable_ld"
+else
+AC_MSG_ERROR( no )
+fi
+else
+AC_MSG_ERROR( not supported )
+fi
+fi
+AC_SUBST(USE_LD)
+
 HAVE_LD_BSYMBOLIC_FUNCTIONS=
 if test "$GCC" = "yes"; then
 AC_MSG_CHECKING([for -Bsymbolic-functions linker support])
diff --git a/solenv/gbuild/platform/com_GCC_defs.mk 
b/solenv/gbuild/platform/com_GCC_defs.mk
index da9440cfeb3d..c9cbe0d96a54 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -35,6 +35,10 @@ else
 gb_AR := $(shell $(CC) -print-prog-name=ar)
 endif
 
+ifneq ($(USE_LD),)
+gb_LinkTarget_LDFLAGS += -fuse-ld=$(USE_LD)
+endif
+
 ifeq ($(strip $(gb_COMPILEROPTFLAGS)),)
 gb_COMPILEROPTFLAGS := -O2
 endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: config_host.mk.in configure.ac solenv/gbuild

[Luboš Luňák]

 config_host.mk.in  |1 +
 configure.ac   |   22 ++
 solenv/gbuild/LinkTarget.mk|9 +
 solenv/gbuild/TargetLocations.mk   |9 +
 solenv/gbuild/platform/com_GCC_defs.mk |4 
 5 files changed, 45 insertions(+)

New commits:
commit 0654030f98355f105ddc741147fc0ff03ab0d906
Author: Luboš Luňák 
Date:   Thu Jun 21 15:37:25 2018 +0200

add --enable-split-debug for -gsplit-dwarf

https://lists.freedesktop.org/archives/libreoffice/2018-June/080437.html

Change-Id: I2a02e23e46d7a54083249408f09fba87932b1d44
Reviewed-on: https://gerrit.libreoffice.org/56416
Reviewed-by: Noel Grandin 
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 

diff --git a/config_host.mk.in b/config_host.mk.in
index c104f07cb1eb..acca001c0bcd 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -248,6 +248,7 @@ export 
HAVE_GCC_FNO_ENFORCE_EH_SPECS=@HAVE_GCC_FNO_ENFORCE_EH_SPECS@
 export HAVE_GCC_FNO_INLINE=@HAVE_GCC_FNO_INLINE@
 export HAVE_GCC_FNO_SIZED_DEALLOCATION=@HAVE_GCC_FNO_SIZED_DEALLOCATION@
 export HAVE_GCC_GGDB2=@HAVE_GCC_GGDB2@
+export HAVE_GCC_SPLIT_DWARF=@HAVE_GCC_SPLIT_DWARF@
 export HAVE_GNUMAKE_FILE_FUNC=@HAVE_GNUMAKE_FILE_FUNC@
 export HAVE_GPGCONF_SOCKETDIR=@HAVE_GPGCONF_SOCKETDIR@
 export HAVE_LD_BSYMBOLIC_FUNCTIONS=@HAVE_LD_BSYMBOLIC_FUNCTIONS@
diff --git a/configure.ac b/configure.ac
index c8d18b18fde8..12516d80219b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1116,6 +1116,11 @@ libo_FUZZ_ARG_ENABLE(debug,
 [Include debugging information, disable compiler optimization and 
inlining plus
  extra debugging code like assertions. Extra large build! (enables -g 
compiler flag).]))
 
+libo_FUZZ_ARG_ENABLE(split-debug,
+AS_HELP_STRING([--enable-split-debug],
+[Uses split debug information (-gsplit-dwarf compile flag). Saves disk 
space and build time,
+ but requires tools that support it (both build tools and 
debuggers).]))
+
 libo_FUZZ_ARG_ENABLE(sal-log,
 AS_HELP_STRING([--enable-sal-log],
 [Make SAL_INFO and SAL_WARN calls do something even in a non-debug 
build.]))
@@ -3864,6 +3869,23 @@ else
 fi
 AC_SUBST(ENABLE_DEBUG)
 
+if test "$enable_split_debug" = yes; then
+HAVE_GSPLIT_DWARF=
+if test "$GCC" = "yes"; then
+AC_MSG_CHECKING([whether $CC supports -gsplit-dwarf])
+save_CFLAGS=$CFLAGS
+CFLAGS="$CFLAGS -Werror -gsplit-dwarf"
+AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[ return 0; ]])],[ 
HAVE_GCC_SPLIT_DWARF=TRUE ],[])
+CFLAGS=$save_CFLAGS
+if test "$HAVE_GCC_SPLIT_DWARF" = "TRUE"; then
+AC_MSG_RESULT([yes])
+else
+AC_MSG_RESULT([no])
+fi
+fi
+AC_SUBST(HAVE_GCC_SPLIT_DWARF)
+fi
+
 if test "$enable_sal_log" = yes; then
 ENABLE_SAL_LOG=TRUE
 fi
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index cbc9499d6eb8..add0655498b0 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -543,22 +543,31 @@ $(WORKDIR)/Clean/LinkTarget/% :
RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),200,\
$(foreach object,$(COBJECTS),$(call 
gb_CObject_get_target,$(object))) \
$(foreach object,$(COBJECTS),$(call 
gb_CObject_get_dep_target,$(object))) \
+   $(foreach object,$(COBJECTS),$(call 
gb_CObject_get_dwo_target,$(object))) \
$(foreach object,$(CXXOBJECTS),$(call 
gb_CxxObject_get_target,$(object))) \
$(foreach object,$(CXXOBJECTS),$(call 
gb_CxxObject_get_dep_target,$(object))) \
+   $(foreach object,$(CXXOBJECTS),$(call 
gb_CxxObject_get_dwo_target,$(object))) \
$(foreach object,$(OBJCOBJECTS),$(call 
gb_ObjCObject_get_target,$(object))) \
$(foreach object,$(OBJCOBJECTS),$(call 
gb_ObjCObject_get_dep_target,$(object))) \
+   $(foreach object,$(OBJCOBJECTS),$(call 
gb_ObjCObject_get_dwo_target,$(object))) \
$(foreach object,$(OBJCXXOBJECTS),$(call 
gb_ObjCxxObject_get_target,$(object))) \
$(foreach object,$(OBJCXXOBJECTS),$(call 
gb_ObjCxxObject_get_dep_target,$(object))) \
+   $(foreach object,$(OBJCXXOBJECTS),$(call 
gb_ObjCxxObject_get_dwo_target,$(object))) \
$(foreach object,$(CXXCLROBJECTS),$(call 
gb_CxxClrObject_get_target,$(object))) \
$(foreach object,$(CXXCLROBJECTS),$(call 
gb_CxxClrObject_get_dep_target,$(object))) \
+   $(foreach object,$(CXXCLROBJECTS),$(call 
gb_CxxClrObject_get_dwo_target,$(object))) \
$(foreach object,$(ASMOBJECTS),$(call 
gb_AsmObject_get_target,$(object))) \
$(foreach object,$(ASMOBJECTS),$(call 
gb_AsmObject_get_dep_target,$(object))) \
+   $(foreach object,$(ASMOBJECTS),$(call 
gb_AsmObject_get_dwo_target,$(object))) \
$(foreach object,$(GENCOBJECTS),$(call 

[Libreoffice-commits] core.git: config_host.mk.in configure.ac solenv/gbuild

[Tor Lillqvist]

 config_host.mk.in|1 +
 configure.ac |1 +
 solenv/gbuild/platform/macosx.mk |4 
 3 files changed, 6 insertions(+)

New commits:
commit 55b9706bea5aa9b654ab39bc7d56339422e17087
Author: Tor Lillqvist 
Date:   Tue Apr 17 23:04:37 2018 +0300

Do use -O1 for Apple Clang older than 9.1.0

Don't want to risk breaking something by using -O2 with an older
Clang, even if I don't remember exactly what the issue was when
introducing the -O1 in 7b660e1423554928350e1de2cd4cb7eb577a27ec.

Change-Id: I2adeb0e8eb85a9b5021fca3d9e1e703cb5604a81
Reviewed-on: https://gerrit.libreoffice.org/53068
Tested-by: Jenkins 
Reviewed-by: Tor Lillqvist 

diff --git a/config_host.mk.in b/config_host.mk.in
index 965cdaf6887a..8f9fb90c98e7 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -62,6 +62,7 @@ export CDR_LIBS=$(gb_SPACE)@CDR_LIBS@
 @x_CFLAGS@ export CFLAGS=@CFLAGS@
 export CLANGDIR=@CLANGDIR@
 export CLANGLIBDIR=@CLANGLIBDIR@
+export CLANGVER=@CLANGVER@
 export CLUCENE_CFLAGS=$(gb_SPACE)@CLUCENE_CFLAGS@
 export CLUCENE_LIBS=$(gb_SPACE)@CLUCENE_LIBS@
 export LIBCMIS_CFLAGS=$(gb_SPACE)@LIBCMIS_CFLAGS@
diff --git a/configure.ac b/configure.ac
index dbd524126005..717e7c1e3d4f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3635,6 +3635,7 @@ if test "$COM_IS_CLANG" = TRUE; then
 AC_DEFINE_UNQUOTED(CLANG_FULL_VERSION,$CLANG_FULL_VERSION)
 fi
 AC_SUBST(COM_IS_CLANG)
+AC_SUBST(CLANGVER)
 
 SHOWINCLUDES_PREFIX=
 if test "$_os" = WINNT; then
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 37ff092ef4cb..be107371f123 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -22,6 +22,10 @@ export VCL_HIDE_WINDOWS=1
 
 gb_SDKDIR := $(MACOSX_SDK_PATH)
 
+ifeq (PRE_9_1_0,$(shell test $(CLANGVER) -lt 90100 && echo PRE_9_1_0))
+gb_COMPILEROPTFLAGS := -O1
+endif
+
 include $(GBUILDDIR)/platform/com_GCC_defs.mk
 
 # Darwin mktemp -t expects a prefix, not a pattern
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: config_host.mk.in configure.ac solenv/gbuild

[Michael Stahl]

 config_host.mk.in   |1 -
 configure.ac|4 
 solenv/gbuild/gbuild.mk |4 ++--
 3 files changed, 2 insertions(+), 7 deletions(-)

New commits:
commit f9b665d9694a8e328379c1b0b4a714edddf4285a
Author: Michael Stahl 
Date:   Wed Jun 7 17:09:30 2017 +0200

configure: remove ENABLE_CRASHDUMP placeholder

It's called ENABLE_BREAKPAD now.

Change-Id: I757c4da415fb895d7cc24f13e201329111246367

diff --git a/config_host.mk.in b/config_host.mk.in
index 8b7c7cfbf5cb..da45e1426271 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -114,7 +114,6 @@ export SYSTEM_COINMP=@SYSTEM_COINMP@
 export COINMP_CFLAGS=@COINMP_CFLAGS@
 export COINMP_LIBS=@COINMP_LIBS@
 export ENABLE_COLLADA=@ENABLE_COLLADA@
-export ENABLE_CRASHDUMP=@ENABLE_CRASHDUMP@
 export ENABLE_CUPS=@ENABLE_CUPS@
 export ENABLE_CURL=@ENABLE_CURL@
 export ENABLE_FUZZERS=@ENABLE_FUZZERS@
diff --git a/configure.ac b/configure.ac
index 522a1aada2c8..22dc6e90ba0e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4587,10 +4587,6 @@ dnl Check for syslog header
 dnl ===
 AC_CHECK_HEADER(syslog.h, AC_DEFINE(HAVE_SYSLOG_H))
 
-# placeholder for future crash reporter feature
-ENABLE_CRASHDUMP=""
-AC_SUBST(ENABLE_CRASHDUMP)
-
 dnl Set the ENABLE_WERROR variable. (Activate --enable-werror)
 dnl ===
 AC_MSG_CHECKING([whether to turn warnings to errors])
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 46d0761e7316..31183b012ac4 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -115,8 +115,8 @@ ENABLE_DEBUGINFO_FOR := all
 endif
 endif
 
-# note: ENABLE_CRASHDUMP turns on gb_SYMBOL
-ifneq ($(strip $(ENABLE_SYMBOLS)$(enable_symbols)$(ENABLE_CRASHDUMP)),)
+# note: ENABLE_BREAKPAD turns on gb_SYMBOL
+ifneq ($(strip $(ENABLE_SYMBOLS)$(enable_symbols)$(ENABLE_BREAKPAD)),)
 gb_SYMBOL := $(true)
 else
 gb_SYMBOL := $(false)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: config_host.mk.in configure.ac solenv/gbuild

[Thorsten Behrens]

 config_host.mk.in|1 -
 configure.ac |   19 ---
 solenv/gbuild/Deliver.mk |   14 +-
 solenv/gbuild/gbuild.mk  |4 
 4 files changed, 1 insertion(+), 37 deletions(-)

New commits:
commit 9ee01c424e37f7cd76d2edf38e9bc5f6e988d18d
Author: Thorsten Behrens 
Date:   Sun Sep 4 06:00:55 2016 +0200

gbuild: remove hardlink deliver

Since there's hardly any 'deliver' going on anymore...

Change-Id: Id349958d299c9742382d37deab2125bc09930c14
Reviewed-on: https://gerrit.libreoffice.org/28655
Tested-by: Jenkins 
Reviewed-by: David Tardon 

diff --git a/config_host.mk.in b/config_host.mk.in
index 6094c7c..e0a6078 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -242,7 +242,6 @@ export GTK_PRINT_CFLAGS=$(gb_SPACE)@GTK_PRINT_CFLAGS@
 export GTK_PRINT_LIBS=$(gb_SPACE)@GTK_PRINT_LIBS@
 export USING_X11=@USING_X11@
 export HAMCREST_JAR=@HAMCREST_JAR@
-export HARDLINKDELIVER=@HARDLINKDELIVER@
 export HAVE_GCC_AVX=@HAVE_GCC_AVX@
 export HAVE_GCC_STACK_PROTECTOR_STRONG=@HAVE_GCC_STACK_PROTECTOR_STRONG@
 export HAVE_GCC_BUILTIN_ATOMIC=@HAVE_GCC_BUILTIN_ATOMIC@
diff --git a/configure.ac b/configure.ac
index 6b28083..66150d2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1029,12 +1029,6 @@ AC_ARG_ENABLE(pdfimport,
 
 dnl -- *** --
 
-AC_ARG_ENABLE([hardlink-deliver],
-AS_HELP_STRING([--enable-hardlink-deliver],
-[Put files into deliver folder as hardlinks instead of copying them
-over. Saves space and speeds up build.])
-)
-
 AC_ARG_ENABLE(mergelibs,
 AS_HELP_STRING([--enable-mergelibs],
 [Enables linking of big, merged, library. Experimental feature, tested
@@ -12809,19 +12803,6 @@ else
 fi
 AC_SUBST([MERGELIBS])
 
-# ===
-# Create hardlinks on deliver instead of copying for smaller size and speed up
-# ===
-AC_MSG_CHECKING([whether to create hardlinks for delivering files])
-HARDLINKDELIVER=
-if test "$enable_hardlink_deliver" = "yes"; then
-HARDLINKDELIVER="TRUE"
-AC_MSG_RESULT([yes])
-else
-AC_MSG_RESULT([no])
-fi
-AC_SUBST(HARDLINKDELIVER)
-
 dnl ===
 dnl icerun is a wrapper that stops us spawning tens of processes
 dnl locally - for tools that can't be executed on the compile cluster
diff --git a/solenv/gbuild/Deliver.mk b/solenv/gbuild/Deliver.mk
index ca609d9..a3e85f3 100644
--- a/solenv/gbuild/Deliver.mk
+++ b/solenv/gbuild/Deliver.mk
@@ -19,16 +19,6 @@
 
 gb_Deliver_GNUCOPY := $(GNUCOPY)
 
-# if ($true) then old files will get removed from the target location before
-# they are copied there. In multi-user environments, if this is needed you need
-# to be the owner of the target file to be able to modify timestamps
-ifeq ($(strip gb_Deliver_HARDLINK),)
-gb_Deliver_CLEARONDELIVER := $(false)
-else
-gb_Deliver_CLEARONDELIVER := $(true)
-endif
-
-
 define gb_Deliver_init
 gb_Deliver_DELIVERABLES :=
 gb_Deliver_DELIVERABLES_INDEX := 
@@ -51,16 +41,14 @@ endif
 endef
 
 define gb_Deliver__deliver
-$(if $(gb_Deliver_CLEARONDELIVER),rm -f $(2) &&) $(if 
$(gb_Deliver_HARDLINK),ln,cp -P -f) $(1) $(2) && $(TOUCH) -hr $(1) $(2)
+$(if $(gb_Deliver_CLEARONDELIVER),rm -f $(2) &&) cp -P -f $(1) $(2) && 
$(TOUCH) -hr $(1) $(2)
 endef
 
 ifneq ($(strip $(gb_Deliver_GNUCOPY)),)
-ifeq ($(strip $(gb_Deliver_HARDLINK)),)
 define gb_Deliver__deliver
 $(gb_Deliver_GNUCOPY) $(if $(gb_Deliver_CLEARONDELIVER),--remove-destination) 
--no-dereference --force --preserve=timestamps $(1) $(2)
 endef
 endif
-endif
 
 define gb_Deliver_deliver
 $(if $(1),$(call gb_Deliver__deliver,$(1),$(2)),\
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index c623770..f98ce81 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -114,10 +114,6 @@ ENABLE_DEBUGINFO_FOR := all
 endif
 endif
 
-ifeq ($(HARDLINKDELIVER),TRUE)
-gb_Deliver_HARDLINK := $(true)
-endif
-
 # note: ENABLE_CRASHDUMP turns on gb_SYMBOL
 ifneq ($(strip $(ENABLE_SYMBOLS)$(enable_symbols)$(ENABLE_CRASHDUMP)),)
 gb_SYMBOL := $(true)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: config_host.mk.in configure.ac solenv/gbuild

[Tomofumi Yagi]

 config_host.mk.in   |2 ++
 configure.ac|   30 ++
 solenv/gbuild/platform/com_MSC_class.mk |2 +-
 3 files changed, 21 insertions(+), 13 deletions(-)

New commits:
commit 3085aba021b411370ab6bc2400e0652cf279d6d3
Author: Tomofumi Yagi 
Date:   Mon Apr 11 13:33:21 2016 +0900

Fix linking of 64 bit artifacts in 32 bit Windows build with VS2015

In some 64bit Windows environments we get the link error while building
libraries for 64-bit Explorer extensions.
This patch will fix this error.

This error occours only when we build 32bit LibreOffice on 64bit Windows
with Visual Studio 2015.

In some environments UCRT SDK directory does not match Windows SDK
directory.
In that case UCRT library's directory path is incorrect at the linking
phase.

Change-Id: I245b1a70f5e1137a8840aa2e7a70f521eab18cb3
Reviewed-on: https://gerrit.libreoffice.org/23982
Tested-by: Jenkins 
Reviewed-by: Norbert Thiebaud 

diff --git a/config_host.mk.in b/config_host.mk.in
index 0a2ec0b..60b87bd 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -594,6 +594,8 @@ export TLS=@TLS@
 export TMPDIR=@TEMP_DIRECTORY@
 export TOUCH=@TOUCH@
 export TYPO_EXTENSION_PACK=@TYPO_EXTENSION_PACK@
+export UCRTSDKDIR=@UCRTSDKDIR@
+export UCRTVERSION=@UCRTVERSION@
 export UNOWINREG_DLL=@UNOWINREG_DLL@
 export USE_LIBRARY_BIN_TAR=@USE_LIBRARY_BIN_TAR@
 export USE_XINERAMA=@USE_XINERAMA@
diff --git a/configure.ac b/configure.ac
index 36bb3a0..3f1b7f0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3322,15 +3322,16 @@ find_ucrt()
 {
 reg_get_value_32 "HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Microsoft 
SDKs/Windows/v10.0/InstallationFolder"
 if test -n "$regvalue"; then
-ucrttest=$regvalue
+PathFormat "$regvalue"
+UCRTSDKDIR=$formatted_path
 reg_get_value_32 "HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Microsoft 
SDKs/Windows/v10.0/ProductVersion"
-ucrtdir=$regvalue
+UCRTVERSION=$regvalue
 fi
-if test -z "$ucrttest"; then
+if test -z "$UCRTSDKDIR"; then
 if test -f "$VC_PRODUCT_DIR/../Common7/Tools/vsvars32.bat"; then
 PathFormat "`win_get_env_from_vsvars32bat "UniversalCRTSdkDir"`"
-ucrttest=$formatted_path
-ucrtdir=`win_get_env_from_vsvars32bat "UCRTVersion"`
+UCRTSDKDIR=$formatted_path
+UCRTVERSION=`win_get_env_from_vsvars32bat "UCRTVersion"`
 fi
 fi
 }
@@ -3421,6 +3422,9 @@ if test "$_os" = "WINNT"; then
 AC_MSG_RESULT([No])
 fi
 
+UCRTSDKDIR=
+UCRTVERSION=
+
 AC_MSG_CHECKING([whether UCRT is needed for this compiler version])
 if test "$vcnum" = "120"; then
 AC_MSG_RESULT([No])
@@ -3428,10 +3432,10 @@ if test "$_os" = "WINNT"; then
 AC_MSG_RESULT([Yes])
 AC_MSG_CHECKING([for UCRT location])
 find_ucrt
-if test -n "$ucrttest"; then
+if test -n "$UCRTSDKDIR"; then
 AC_MSG_RESULT([found])
-PathFormat "$ucrttest"
-ucrtincpath_formatted="${formatted_path}Include/$ucrtdir/ucrt"
+PathFormat "${UCRTSDKDIR}Include/$UCRTVERSION/ucrt"
+ucrtincpath_formatted=$formatted_path
 # SOLARINC is used for external modules and must be set too.
 # And no, it's not sufficient to set SOLARINC only, as 
configure
 # itself doesn't honour it.
@@ -3443,6 +3447,8 @@ if test "$_os" = "WINNT"; then
 AC_MSG_ERROR([not found])
 fi
 fi
+AC_SUBST(UCRTSDKDIR)
+AC_SUBST(UCRTVERSION)
 
 # Find the proper version of MSBuild.exe to use based on the VS version
 reg_get_value_32 
HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/MSBuild/$vcnumwithdot/MSBuildOverrideTasksPath
@@ -12532,8 +12538,8 @@ if test "$build_os" = "cygwin"; then
 ILIB1="$ILIB1 
-LIBPATH:$WINDOWS_SDK_HOME/lib/$winsdklibsubdir/um/x64"
 fi
 if test $VCVER = 140; then
-PathFormat "$ucrttest"
-ucrtlibpath_formatted="${formatted_path}lib/$ucrtdir/ucrt/x64"
+PathFormat "${UCRTSDKDIR}lib/$UCRTVERSION/ucrt/x64"
+ucrtlibpath_formatted=$formatted_path
 ILIB="$ILIB;$ucrtlibpath_formatted"
 fi
 else
@@ -12546,8 +12552,8 @@ if test "$build_os" = "cygwin"; then
 ILIB1="$ILIB1 
-LIBPATH:$WINDOWS_SDK_HOME/lib/$winsdklibsubdir/um/x86"
 fi
 if test $VCVER = 140; then
-PathFormat "$ucrttest"
-ucrtlibpath_formatted="${formatted_path}lib/$ucrtdir/ucrt/x86"
+PathFormat "${UCRTSDKDIR}lib/$UCRTVERSION/ucrt/x86"
+ucrtlibpath_formatted=$formatted_path
 ILIB="$ILIB;$ucrtlibpath_formatted"
 fi

[Libreoffice-commits] core.git: config_host.mk.in configure.ac solenv/gbuild

[Caolán McNamara]

 config_host.mk.in  |1 +
 configure.ac   |   12 
 solenv/gbuild/platform/com_GCC_defs.mk |5 +
 3 files changed, 18 insertions(+)

New commits:
commit 34555600b019a85f0aec0a9d18e7833bc934788b
Author: Caolán McNamara caol...@redhat.com
Date:   Mon Dec 1 10:02:36 2014 +

attempt to default enable stack-protector-strong

Change-Id: Iee42b3f6ab66636961e9ba1da33ab0e83d607eaa
Reviewed-on: https://gerrit.libreoffice.org/13241
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com

diff --git a/config_host.mk.in b/config_host.mk.in
index 648705a..13639e8 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -240,6 +240,7 @@ export GUIBASE=@GUIBASE@
 export HAMCREST_JAR=@HAMCREST_JAR@
 export HARDLINKDELIVER=@HARDLINKDELIVER@
 export HAVE_GCC_AVX=@HAVE_GCC_AVX@
+export HAVE_GCC_STACK_PROTECTOR_STRONG=@HAVE_GCC_STACK_PROTECTOR_STRONG@
 export HAVE_GCC_BUILTIN_ATOMIC=@HAVE_GCC_BUILTIN_ATOMIC@
 export HAVE_GCC_FINLINE_LIMIT=@HAVE_GCC_FINLINE_LIMIT@
 export HAVE_GCC_FNO_DEFAULT_INLINE=@HAVE_GCC_FNO_DEFAULT_INLINE@
diff --git a/configure.ac b/configure.ac
index ae82b56..3be712e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5751,6 +5751,17 @@ if test $GCC = yes; then
 AC_MSG_RESULT([no])
 fi
 
+AC_MSG_CHECKING([whether $CC supports -fstack-protector-strong])
+save_CFLAGS=$CFLAGS
+CFLAGS=$CFLAGS -Werror -fstack-protector-strong
+AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[ return 0; ]])],[ 
HAVE_GCC_STACK_PROTECTOR_STRONG=TRUE ],[])
+CFLAGS=$save_CFLAGS
+if test $HAVE_GCC_STACK_PROTECTOR_STRONG = TRUE; then
+AC_MSG_RESULT([yes])
+else
+AC_MSG_RESULT([no])
+fi
+
 AC_MSG_CHECKING([whether $CC supports atomic functions])
 AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[
 int v = 0;
@@ -5844,6 +5855,7 @@ if test $GCC = yes; then
 fi
 
 AC_SUBST(HAVE_GCC_AVX)
+AC_SUBST(HAVE_GCC_STACK_PROTECTOR_STRONG)
 AC_SUBST(HAVE_GCC_BUILTIN_ATOMIC)
 
 dnl ===
diff --git a/solenv/gbuild/platform/com_GCC_defs.mk 
b/solenv/gbuild/platform/com_GCC_defs.mk
index b6d9735..7acd068 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -96,6 +96,11 @@ gb_CXXFLAGS_COMMON += -fvisibility-inlines-hidden
 endif
 endif
 
+ifeq ($(HAVE_GCC_STACK_PROTECTOR_STRONG),TRUE)
+gb_CFLAGS_COMMON += -fstack-protector-strong
+gb_CXXFLAGS_COMMON += -fstack-protector-strong
+endif
+
 gb_CFLAGS_WERROR := $(if $(ENABLE_WERROR),-Werror)
 
 # This is the default in non-C++11 mode
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: config_host.mk.in configure.ac solenv/gbuild

[Tor Lillqvist]

 config_host.mk.in   |2 +-
 configure.ac|   10 +-
 solenv/gbuild/gbuild.mk |2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit c7cacf639d873e33cd98c56a0006d877b132341e
Author: Tor Lillqvist t...@collabora.com
Date:   Thu Oct 23 13:16:19 2014 +0300

Rename --enable-sal-info to --enable-sal-log

Change-Id: I896c9ac1c941b85d052fbefb902c4341664881d4

diff --git a/config_host.mk.in b/config_host.mk.in
index 4de9201..395274d 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -165,7 +165,7 @@ export ENABLE_RANDR=@ENABLE_RANDR@
 export ENABLE_RELEASE_BUILD=@ENABLE_RELEASE_BUILD@
 export ENABLE_REPORTBUILDER=@ENABLE_REPORTBUILDER@
 export ENABLE_RUNTIME_OPTIMIZATIONS=@ENABLE_RUNTIME_OPTIMIZATIONS@
-export ENABLE_SAL_INFO=@ENABLE_SAL_INFO@
+export ENABLE_SAL_LOG=@ENABLE_SAL_LOG@
 export ENABLE_SCRIPTING_BEANSHELL=@ENABLE_SCRIPTING_BEANSHELL@
 export ENABLE_SCRIPTING_JAVASCRIPT=@ENABLE_SCRIPTING_JAVASCRIPT@
 export ENABLE_SDREMOTE=@ENABLE_SDREMOTE@
diff --git a/configure.ac b/configure.ac
index a72e4a8..07eb557 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1015,8 +1015,8 @@ AC_ARG_ENABLE(debug,
 [Include debugging information, disable compiler optimization and 
inlining plus
  extra debugging code like assertions. Extra large build! (enables -g 
compiler flag).]))
 
-AC_ARG_ENABLE(sal-info,
-AS_HELP_STRING([--enable-sal-info],
+AC_ARG_ENABLE(sal-log,
+AS_HELP_STRING([--enable-sal-log],
 [Make SAL_INFO and SAL_WARN calls do something even in a non-debug 
build.]))
 
 AC_ARG_ENABLE(selective-debuginfo,
@@ -3805,10 +3805,10 @@ AC_SUBST(ENABLE_DEBUG)
 AC_SUBST(ANDROID_DEBUGGABLE)
 AC_SUBST(ANDROID_INSTALL_LOCATION)
 
-if test $enable_sal_info = yes; then
-ENABLE_SAL_INFO=TRUE
+if test $enable_sal_log = yes; then
+ENABLE_SAL_LOG=TRUE
 fi
-AC_SUBST(ENABLE_SAL_INFO)
+AC_SUBST(ENABLE_SAL_LOG)
 
 dnl Selective debuginfo
 ENABLE_DEBUGINFO_FOR=
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 5c02a19..3145540 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -239,7 +239,7 @@ gb_GLOBALDEFS += -DNDEBUG \
 
 endif
 
-ifeq ($(ENABLE_SAL_INFO),TRUE)
+ifeq ($(ENABLE_SAL_LOG),TRUE)
 gb_GLOBALDEFS += -DSAL_LOG_INFO \
 -DSAL_LOG_WARN \
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: config_host.mk.in configure.ac solenv/gbuild

[Peter Foley]

 config_host.mk.in  |1 
 configure.ac   |   51 +++--
 solenv/gbuild/JunitTest.mk |3 +-
 3 files changed, 48 insertions(+), 7 deletions(-)

New commits:
commit 4db2d600ebc541adfaaf0a1a176df1c74e3ae0e4
Author: Peter Foley pefol...@pefoley.com
Date:   Tue Sep 9 22:19:42 2014 -0400

Add support for external hamcrest when using junit 4.11+

Starting with junit 4.11 hamcrest is no longer bundled,
so add a --with-hamcrest option to support this.

Change-Id: Icdae946af82b9c56bf25d37cbf88275fc6a6a1eb
Reviewed-on: https://gerrit.libreoffice.org/11383
Reviewed-by: Stephan Bergmann sberg...@redhat.com
Tested-by: Stephan Bergmann sberg...@redhat.com

diff --git a/config_host.mk.in b/config_host.mk.in
index e717745..605bb6b 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -239,6 +239,7 @@ export GTK_LIBS=$(gb_SPACE)@GTK_LIBS@
 export GTK_PRINT_CFLAGS=$(gb_SPACE)@GTK_PRINT_CFLAGS@
 export GTK_PRINT_LIBS=$(gb_SPACE)@GTK_PRINT_LIBS@
 export GUIBASE=@GUIBASE@
+export HAMCREST_JAR=@HAMCREST_JAR@
 export HARDLINKDELIVER=@HARDLINKDELIVER@
 export HAVE_GCC_AVX=@HAVE_GCC_AVX@
 export HAVE_GCC_BUILTIN_ATOMIC=@HAVE_GCC_BUILTIN_ATOMIC@
diff --git a/configure.ac b/configure.ac
index e5c01e8..84add6c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1987,6 +1987,15 @@ AC_ARG_WITH(junit,
 ],
 ,with_junit=yes)
 
+AC_ARG_WITH(hamcrest,
+AS_HELP_STRING([--with-hamcrest],
+[Specifies the hamcrest jar file to use for JUnit-based tests.
+ --without-junit disables those tests. Not relevant in the 
--without-java case.])
+[
+  Usage: --with-hamcrest=absolute path to 
hamcrest jar
+],
+,with_hamcrest=yes)
+
 AC_ARG_WITH(perl-home,
 AS_HELP_STRING([--with-perl-home],
 [If you have installed Perl 5 Distribution, on your system, please
@@ -12051,23 +12060,53 @@ if test $ENABLE_JAVA !=  -a $with_junit != 
no; then
 if test $_os = WINNT; then
 OOO_JUNIT_JAR=`cygpath -m $OOO_JUNIT_JAR`
 fi
-printf 'import org.junit.Before; import org.hamcrest.BaseDescription;' \
- conftest.java
+printf 'import org.junit.Before;'  conftest.java
 if $JAVACOMPILER -classpath $OOO_JUNIT_JAR conftest.java 5 25; then
 AC_MSG_RESULT([$OOO_JUNIT_JAR])
 else
 AC_MSG_ERROR(
-[cannot find JUnit 4 jar, or JUnit 4 jar does not provide Hamcrest; please
-install one in the default location (/usr/share/java), specify its pathname via
---with-junit=..., or disable it via --without-junit])
+[cannot find JUnit 4 jar; please install one in the default location 
(/usr/share/java),
+ specify its pathname via --with-junit=..., or disable it via --without-junit])
 fi
-rm -f conftestj.class conftestj.java
+rm -f conftest.class conftest.java
 if test $OOO_JUNIT_JAR != ; then
 BUILD_TYPE=$BUILD_TYPE QADEVOOO
 fi
 fi
 AC_SUBST(OOO_JUNIT_JAR)
 
+HAMCREST_JAR=
+if test $ENABLE_JAVA !=  -a $with_junit != no; then
+AC_MSG_CHECKING([for included Hamcrest])
+printf 'import org.hamcrest.BaseDescription;'  conftest.java
+if $JAVACOMPILER -classpath $OOO_JUNIT_JAR conftest.java 5 25; then
+AC_MSG_RESULT([Included in $OOO_JUNIT_JAR])
+else
+AC_MSG_RESULT([Not included])
+AC_MSG_CHECKING([for standalone hamcrest jar.])
+if test $with_hamcrest = yes; then
+if test -e /usr/share/lib/java/hamcrest.jar; then
+HAMCREST_JAR=/usr/share/lib/java/hamcrest.jar
+else
+HAMCREST_JAR=/usr/share/java/hamcrest.jar
+fi
+else
+HAMCREST_JAR=$with_hamcrest
+fi
+if test $_os = WINNT; then
+HAMCREST_JAR=`cygpath -m $HAMCREST_JAR`
+fi
+if $JAVACOMPILER -classpath $HAMCREST_JAR conftest.java 5 25; 
then
+AC_MSG_RESULT([$HAMCREST_JAR])
+else
+AC_MSG_ERROR([junit does not contain hamcrest; please use a junit 
jar that includes hamcrest, install a hamcrest jar in the default location 
(/usr/share/java),
+  specify its path with --with-hamcrest=..., or 
disable junit with --without-junit])
+fi
+fi
+rm -f conftest.class conftest.java
+fi
+AC_SUBST(HAMCREST_JAR)
+
 
 AC_SUBST(SCPDEFS)
 
diff --git a/solenv/gbuild/JunitTest.mk b/solenv/gbuild/JunitTest.mk
index 9801ed2..8370603 100644
--- a/solenv/gbuild/JunitTest.mk
+++ b/solenv/gbuild/JunitTest.mk
@@ -54,12 +54,13 @@ $(call gb_JunitTest_get_target,%) :
$(CLEAN_CMD)
 
 define gb_JunitTest_JunitTest
-$(call gb_JunitTest_get_target,$(1)) : T_CP := $(call 
gb_JavaClassSet_get_classdir,$(call 
gb_JunitTest_get_classsetname,$(1)))$$(gb_CLASSPATHSEP)$(OOO_JUNIT_JAR)$$(gb_CLASSPATHSEP)$(INSTROOT)/$(LIBO_URE_LIB_FOLDER)
+$(call gb_JunitTest_get_target,$(1)) : T_CP := $(call 
gb_JavaClassSet_get_classdir,$(call 

[Libreoffice-commits] core.git: config_host.mk.in configure.ac solenv/gbuild

[Tor Lillqvist]

 config_host.mk.in   |1 
 configure.ac|   36 +++-
 solenv/gbuild/platform/com_MSC_class.mk |2 -
 3 files changed, 28 insertions(+), 11 deletions(-)

New commits:
commit e23fa8db9fa4e6367d7bfcd34289ea10388783fa
Author: Tor Lillqvist t...@collabora.com
Date:   Mon Jul 28 09:16:57 2014 +0300

Improvements for Windows build with only VS2013 installed

I thought it was possible now to build on Windows with Visual Studio
2013 as the only installed Visual Studio version, but no. I tried on a
fresh Windows 8.1 installation.

This commit fixes the configury a bit at least. (One needs to pass the
--with-visual-studio=2013 option. Otherwise configure gets confused by
the partial (?) VS2012 that seems to be installed, too, when
installing VS2013, and prefers that...)

The build fails at least in external/lcms2, but I'll leave sorting out
that for later.

Change-Id: I15942e4b088a3f0a62c3f7fa8f9b45f77beaff6f

diff --git a/config_host.mk.in b/config_host.mk.in
index 316f56a..8c38df6 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -594,6 +594,7 @@ export 
WATCH_WINDOW_EXTENSION_PACK=@WATCH_WINDOW_EXTENSION_PACK@
 export WGET=@WGET@
 export WINDOWS_BUILD_SIGNING=@WINDOWS_BUILD_SIGNING@
 export WINDOWS_SDK_HOME=@WINDOWS_SDK_HOME@
+export WINDOWS_SDK_LIB_SUBDIR=@WINDOWS_SDK_LIB_SUBDIR@
 export WINDOWS_SDK_VERSION=@WINDOWS_SDK_VERSION@
 export WINDOWS_SDK_WILANGID=@WINDOWS_SDK_WILANGID@
 export WINDRES=@WINDRES@
diff --git a/configure.ac b/configure.ac
index 45f77ed..20049b3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5317,9 +5317,9 @@ find_dotnetsdk()
 find_winsdk_version()
 {
 # Args: $1 : SDK version as in 6.0A, 7.0 etc
-# Return value: $winsdktest
+# Return values: $winsdktest, $winsdklibsubdir
 
-unset winsdktest
+unset winsdktest winsdklibsubdir
 
 # Why we look for them in this particular order I don't know. But OTOH I
 case $1 in
@@ -5327,6 +5327,15 @@ find_winsdk_version()
 reg_get_value_32 HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Microsoft 
SDKs/Windows/v${1}/InstallationFolder
 if test -n $regvalue; then
 winsdktest=$regvalue
+winsdklibsubdir=.
+return
+fi
+;;
+8.1)
+reg_get_value_32 HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Windows 
Kits/Installed Roots/KitsRoot81
+if test -n $regvalue; then
+winsdktest=$regvalue
+winsdklibsubdir=winv6.3
 return
 fi
 ;;
@@ -5334,6 +5343,7 @@ find_winsdk_version()
 reg_get_value_32 HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Windows 
Kits/Installed Roots/KitsRoot
 if test -n $regvalue; then
 winsdktest=$regvalue
+winsdklibsubdir=win8
 return
 fi
 ;;
@@ -5463,13 +5473,13 @@ if test $build_os = cygwin; then
 DOTNET_FRAMEWORK_HOME=$frametest
 else
 find_winsdk
-if test -f $winsdktest/lib/mscoree.lib -o -f 
$winsdktest/lib/win8/um/$WINDOWS_SDK_ARCH/mscoree.lib; then
+if test -f $winsdktest/lib/mscoree.lib -o -f 
$winsdktest/lib/$winsdklibsubdir/um/$WINDOWS_SDK_ARCH/mscoree.lib; then
 DOTNET_FRAMEWORK_HOME=$winsdktest
 fi
 fi
 
-if test ! -f $DOTNET_FRAMEWORK_HOME/lib/mscoree.lib -a ! -f 
$DOTNET_FRAMEWORK_HOME/lib/win8/um/$WINDOWS_SDK_ARCH/mscoree.lib; then
-AC_MSG_ERROR([mscoree.lib (.NET Framework) not found])
+if test ! -f $DOTNET_FRAMEWORK_HOME/lib/mscoree.lib -a ! -f 
$DOTNET_FRAMEWORK_HOME/lib/$winsdklibsubdir/um/$WINDOWS_SDK_ARCH/mscoree.lib; 
then
+AC_MSG_ERROR([mscoree.lib not found])
 fi
 AC_MSG_RESULT(found)
 
@@ -9729,6 +9739,8 @@ if test $_os = WINNT; then
 WINDOWS_SDK_HOME=`cygpath -d $WINDOWS_SDK_HOME`
 WINDOWS_SDK_HOME=`cygpath -u $WINDOWS_SDK_HOME`
 fi
+
+WINDOWS_SDK_LIB_SUBDIR=$winsdklibsubdir
 fi
 
 if test -n $WINDOWS_SDK_HOME; then
@@ -9749,7 +9761,7 @@ if test $_os = WINNT; then
 
 if test -f $WINDOWS_SDK_HOME/lib/user32.lib; then
 have_windows_sdk_libs=yes
-elif test -f 
$WINDOWS_SDK_HOME/lib/win8/um/$WINDOWS_SDK_ARCH/user32.lib; then
+elif test -f 
$WINDOWS_SDK_HOME/lib/$winsdklibsubdir/um/$WINDOWS_SDK_ARCH/user32.lib; then
 have_windows_sdk_libs=yes
 else
 have_windows_sdk_libs=no
@@ -9794,6 +9806,9 @@ the  Windows SDK are installed.])
 add_warning If a build created with VS 2012 should run on Windows 
XP,
 add_warning use --with-windows-sdk=7.1A (requires VS 2012 Update 
1 or newer)
 fi
+elif echo $WINDOWS_SDK_HOME | grep 8.1 /dev/null 2/dev/null; then
+WINDOWS_SDK_VERSION=81
+AC_MSG_RESULT([found Windows SDK 8.1 ($WINDOWS_SDK_HOME)])
 else
 AC_MSG_ERROR([Found legacy Windows Platform SDK ($WINDOWS_SDK_HOME)])
 fi

[Libreoffice-commits] core.git: config_host.mk.in configure.ac solenv/gbuild

[Norbert Thiebaud]

 config_host.mk.in   |1 
 configure.ac|  138 
 solenv/gbuild/gbuild.mk |4 
 solenv/gbuild/platform/com_MSC_class.mk |5 -
 solenv/gbuild/platform/com_MSC_defs.mk  |   10 ++
 5 files changed, 106 insertions(+), 52 deletions(-)

New commits:
commit a89b8601ce7be0b6dc3f262661ea7802f2c725fd
Author: Norbert Thiebaud nthieb...@gmail.com
Date:   Tue Jul 1 12:13:07 2014 +

auto-detect the presence of a native gmake on windows

Change-Id: Ie1c7e022a2e1713a111ebd2db9db866e09f4f4f4
Reviewed-on: https://gerrit.libreoffice.org/10120
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com

diff --git a/config_host.mk.in b/config_host.mk.in
index 72e1f8c..382a407 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -208,6 +208,7 @@ export GNUTLS_LIBS=$(gb_SPACE)@GNUTLS_LIBS@
 export PARALLELISM?=@PARALLELISM@
 @x_GNUCP@ export GNUCOPY=@GNUCP@
 export GNUMAKE=@GNUMAKE@
+export GNUMAKE_WIN_NATIVE=@GNUMAKE_WIN_NATIVE@
 export GNUPATCH=@GNUPATCH@
 export GNUTAR=@GNUTAR@
 export GOBJECT_CFLAGS=$(gb_SPACE)@GOBJECT_CFLAGS@
diff --git a/configure.ac b/configure.ac
index 1a260ac..12e45dd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -39,7 +39,11 @@ PathFormat()
 fi
 done
 if test $pf_conv_to_dos = yes; then
-formatted_path=`cygpath -sm $formatted_path`
+if test $GNUMAKE_WIN_NATIVE = TRUE ; then
+formatted_path=`cygpath -sm $formatted_path`
+else
+formatted_path=`cygpath -d $formatted_path`
+fi
 if test $? -ne 0;  then
 AC_MSG_ERROR([path conversion failed for $1.])
 fi
@@ -186,6 +190,57 @@ SRC_ROOT=`pwd`
 cd $BUILDDIR
 x_Cygwin=[\#]
 
+dnl ===
+dnl Search all the common names for GNU make
+dnl ===
+AC_MSG_CHECKING([for GNU make])
+
+# try to use our own make if it is available and GNUMAKE was not already 
defined
+if test -z $GNUMAKE; then
+if test -x /opt/lo/bin/make; then
+GNUMAKE=/opt/lo/bin/make
+fi
+fi
+
+GNUMAKE_WIN_NATIVE=
+for a in $MAKE $GNUMAKE make gmake gnumake; do
+if test -n $a; then
+$a --version 2 /dev/null | grep GNU  21  /dev/null
+if test $? -eq 0;  then
+if test $build_os = cygwin; then
+if test -n $($a -v | grep 'Built for Windows') ; then
+GNUMAKE=$(cygpath -m $(which $(cygpath -u $a)))
+GNUMAKE_WIN_NATIVE=TRUE
+else
+GNUMAKE=`which $a`
+fi
+else
+GNUMAKE=`which $a`
+fi
+break
+fi
+fi
+done
+AC_MSG_RESULT($GNUMAKE)
+if test -z $GNUMAKE; then
+AC_MSG_ERROR([not found. install GNU make.])
+else
+if test $GNUMAKE_WIN_NATIVE = TRUE ; then
+AC_MSG_NOTICE([Using a native Win32 gnumake version.])
+fi
+fi
+
+win_short_path_for_make()
+{
+local_short_path=$1
+if test $GNUMAKE_WIN_NATIVE = TRUE ; then
+cygpath -sm $local_short_path
+else
+cygpath -u $(cygpath -d $local_short_path)
+fi
+}
+
+
 if test $build_os = cygwin; then
 PathFormat $SRC_ROOT
 SRC_ROOT=$formatted_path
@@ -2308,8 +2363,13 @@ pathmunge ()
 {
 if test -n $1; then
 if test $build_os = cygwin; then
-PathFormat $1
-new_path=`cygpath -sm $formatted_path`
+if test $GNUMAKE_WIN_NATIVE = TRUE ; then
+PathFormat $1
+new_path=`cygpath -sm $formatted_path`
+else
+PathFormat $1
+new_path=`cygpath -u $formatted_path`
+fi
 else
 new_path=$1
 fi
@@ -3676,7 +3736,7 @@ if test $_os = WINNT; then
 fi
 fi
 
-VC_PRODUCT_DIR=`cygpath -sm $VC_PRODUCT_DIR`
+VC_PRODUCT_DIR=`win_short_path_for_make $VC_PRODUCT_DIR`
 AC_MSG_RESULT([$VC_PRODUCT_DIR])
 
 dnl ===
@@ -3726,7 +3786,7 @@ if test $_os = WINNT; then
 fi
 
 # This gives us a posix path with 8.3 filename restrictions
-CC=`cygpath -sm $CC`
+CC=`win_short_path_for_make $CC`
 fi
 
 if test -n $CC; then
@@ -4095,8 +4155,11 @@ cygwin*)
 GUIBASE=not-used
 OS=WNT
 RTL_OS=Windows
-P_SEP=;
-
+if test $GNUMAKE_WIN_NATIVE = TRUE ; then
+P_SEP=;
+else
+P_SEP=:
+fi
 case $host_cpu in
 i*86|x86_64)
 if test $BITNESS_OVERRIDE = 64; then
@@ -4967,36 +5030,6 @@ else
 fi
 AC_SUBST(ENABLE_PCH)
 
-dnl ===
-dnl Search all the common names for GNU make
-dnl 

[Libreoffice-commits] core.git: config_host.mk.in configure.ac solenv/gbuild

[Norbert Thiebaud]

 config_host.mk.in   |1 -
 configure.ac|   16 ++--
 solenv/gbuild/platform/com_GCC_class.mk |   21 +
 3 files changed, 3 insertions(+), 35 deletions(-)

New commits:
commit d496bcdb770a61400abf4f67baae5103505f8a34
Author: Norbert Thiebaud nthieb...@gmail.com
Date:   Wed Jul 10 21:01:11 2013 -0500

we do not support any platform with bison  2.0 anymore

Change-Id: Ia2c1c6ed43c6a42fa1a65a22f4c8d68de216706c
Reviewed-on: https://gerrit.libreoffice.org/4822
Reviewed-by: Petr Mladek pmla...@suse.cz
Tested-by: Petr Mladek pmla...@suse.cz

diff --git a/config_host.mk.in b/config_host.mk.in
index 58d2a0e..8e14d7a 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -15,7 +15,6 @@ export BUILDDIR=@BUILDDIR@
 @x_AFLAGS@ export AFLAGS=@AFLAGS@
 export ALLOC=@ALLOC@
 export ALL_LANGS=@ALL_LANGS@
-export ANCIENT_BISON=@ANCIENT_BISON@
 export ANDROID_APP_ABI=@ANDROID_APP_ABI@
 export ANDROID_NDK_GDBSERVER=@ANDROID_NDK_GDBSERVER@
 export ANDROID_SDK_HOME=@ANDROID_SDK_HOME@
diff --git a/configure.ac b/configure.ac
index 69479c3..3db1813 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9219,29 +9219,17 @@ dnl ***
 dnl Checking for bison and flex
 dnl ***
 AC_PATH_PROG(BISON, bison)
-ANCIENT_BISON=NO
 if test -z $BISON; then
 AC_MSG_ERROR([no bison found in \$PATH, install it])
 else
 AC_MSG_CHECKING([the bison version])
 _bison_version=`$BISON --version | grep GNU | $SED -e 's@^[[^0-9]]*@@' -e 
's@ .*@@' -e 's@,.*@@'`
 _bison_longver=`echo $_bison_version | $AWK -F. '{ print \$1*1000+\$2}'`
-# Accept newer than 1.875 or older(equal) than 1.75
-if test $_bison_longver -ge 1875 -o $_bison_longver -le 1075; then
-if test $_bison_version = 1.875; then
-AC_MSG_WARN([suspect ($BISON $_bison_version)])
-add_warning Suspect ($BISON $_bison_version) suggest upgrade
-else
-AC_MSG_RESULT([checked ($BISON $_bison_version)])
-fi
-else
-AC_MSG_ERROR([failed ($BISON $_bison_version need 1.875+ (or 1.75 and 
older))])
-fi
+# Accept newer than 2.0
 if test $_bison_longver -lt 2000; then
-ANCIENT_BISON=YES
+AC_MSG_ERROR([failed ($BISON $_bison_version need 2.0+)])
 fi
 fi
-AC_SUBST(ANCIENT_BISON)
 
 AC_PATH_PROG(FLEX, flex)
 if test -z $FLEX; then
diff --git a/solenv/gbuild/platform/com_GCC_class.mk 
b/solenv/gbuild/platform/com_GCC_class.mk
index 5464715..e16ad03 100644
--- a/solenv/gbuild/platform/com_GCC_class.mk
+++ b/solenv/gbuild/platform/com_GCC_class.mk
@@ -233,33 +233,14 @@ endef
 
 # YaccTarget class
 
-ifeq ($(ANCIENT_BISON),YES)
-#
-# There are ancient versions of bison out there, which do not handle
-# well .cxx extensions, nor do they support --defines=file. The
-# result is that the header is named foo.cxx.h instead of foo.hxx
-# so we queue a mv to rename the header accordingly.
-# One example is XCode versions 2.x, which are used on OSX ppc
-# machines.
-#
 define gb_YaccTarget__command
 $(call gb_Output_announce,$(2),$(true),YAC,3)
 $(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $(3))  \
-   $(gb_YACC) $(T_YACCFLAGS) -d -o $(5) $(1)  mv $(5).h $(4)  touch 
$(3) )
+   $(gb_YACC) $(T_YACCFLAGS) -v --defines=$(4) -o $(5) $(1)  touch $(3) )
 
 endef
 
-else
-define gb_YaccTarget__command
-$(call gb_Output_announce,$(2),$(true),YAC,3)
-$(call gb_Helper_abbreviate_dirs,\
-   mkdir -p $(dir $(3))  \
-   $(gb_YACC) $(T_YACCFLAGS) --defines=$(4) -o $(5) $(1)  touch $(3) )
-
-endef
-endif
-
 # ExternalProject class
 
 gb_ExternalProject_use_autoconf :=
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: config_host.mk.in configure.ac solenv/gbuild

[Peter Foley]

 config_host.mk.in |1 +
 configure.ac  |5 +
 solenv/gbuild/JavaClassSet.mk |3 ++-
 3 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit b97cade9183d14ad21ae71892348a9a81689488b
Author: Peter Foley pefol...@verizon.net
Date:   Sun Apr 7 12:14:36 2013 -0400

Supress warnings about unset classpath

I get the below warning for every single jar file without this patch.
warning: [options] bootstrap class path not set in conjunction with
-source 1.5
1 warning

Change-Id: I71c01aeea993640f1ec86fe1d8a977656861358d

diff --git a/config_host.mk.in b/config_host.mk.in
index 66a5c68..772e5d4 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -257,6 +257,7 @@ export JAVACOMPILER=@JAVACOMPILER@
 export JAVADOC=@JAVADOC@
 export JAVADOCISGJDOC=@JAVADOCISGJDOC@
 export JAVAIFLAGS=@JAVAIFLAGS@
+export JAVA_CLASSPATH_NOT_SET=@JAVA_CLASSPATH_NOT_SET@
 export JAVAINTERPRETER=@JAVAINTERPRETER@
 @x_JAVALIB@ export JAVALIB=@JAVALIB@
 export JAVA_HOME=@JAVA_HOME@
diff --git a/configure.ac b/configure.ac
index 912c111..cdda016 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6068,6 +6068,10 @@ you must use the --with-jdk-home configure option 
explicitly])
 if test $_jdk_ver -lt 10500; then
 AC_MSG_ERROR([JDK is too old, you need at least 1.5])
 fi
+if test $_jdk_ver -gt 10600; then
+JAVA_CLASSPATH_NOT_SET=1
+fi
+
 AC_MSG_RESULT([checked (JDK $_jdk)])
 JAVA_HOME=`echo $JAVAINTERPRETER | $SED -n s,//*bin//*java,,p`
 if test $_os = WINNT; then
@@ -6613,6 +6617,7 @@ AC_SUBST(JAVACOMPILER)
 AC_SUBST(JAVADOC)
 AC_SUBST(JAVAINTERPRETER)
 AC_SUBST(JAVAIFLAGS)
+AC_SUBST(JAVA_CLASSPATH_NOT_SET)
 AC_SUBST(JAVA_HOME)
 AC_SUBST(JAVA_SOURCE_VER)
 AC_SUBST(JAVA_TARGET_VER)
diff --git a/solenv/gbuild/JavaClassSet.mk b/solenv/gbuild/JavaClassSet.mk
index 7dd586a..a3e6477 100644
--- a/solenv/gbuild/JavaClassSet.mk
+++ b/solenv/gbuild/JavaClassSet.mk
@@ -27,7 +27,8 @@
 #*
 
 gb_JavaClassSet_JAVACCOMMAND := $(ICECREAM_RUN) $(JAVACOMPILER) $(JAVAFLAGS) \
--source $(JAVA_SOURCE_VER) -target $(JAVA_TARGET_VER)
+-source $(JAVA_SOURCE_VER) -target $(JAVA_TARGET_VER) \
+$(if $(JAVA_CLASSPATH_NOT_SET),-Xlint:-options)
 gb_JavaClassSet_JAVACDEBUG :=
 
 # Enforces correct dependency order for possibly generated stuff:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits