[Libreoffice-commits] core.git: solenv/gbuild

[Mike Kaganski (via logerrit)]

 solenv/gbuild/UITest.mk |4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit b5743ae5f576e45576426593da58fa74bb88c01b
Author: Mike Kaganski 
AuthorDate: Sat Nov 25 12:49:16 2023 +0100
Commit: Mike Kaganski 
CommitDate: Sat Nov 25 13:42:46 2023 +0100

Simplify UITest's custom configuration handling

Change-Id: I20d7d3a17b3a0ca817ee5acdab77f51983852078
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159898
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/solenv/gbuild/UITest.mk b/solenv/gbuild/UITest.mk
index 65bc37c1d1bf..334080b70a70 100644
--- a/solenv/gbuild/UITest.mk
+++ b/solenv/gbuild/UITest.mk
@@ -60,11 +60,9 @@ else
$(call gb_Helper_abbreviate_dirs,\
rm -rf $(dir $(call gb_UITest_get_target,$*)) && \
mkdir -p $(dir $(call gb_UITest_get_target,$*))/user/user && \
-   cp $(SRCDIR)/qadevOOo/qa/registrymodifications.xcu $(dir $(call 
gb_UITest_get_target,$*))/user/user/ && \
+   cp -T $(if 
$(gb_UITest_use_config),$(gb_UITest_use_config),$(SRCDIR)/qadevOOo/qa/registrymodifications.xcu)
 $(dir $(call gb_UITest_get_target,$*))/user/user/registrymodifications.xcu && \
$(if $(gb_UITest__interactive),, \
rm -fr $@.core && mkdir -p $(dir $(call 
gb_UITest_get_target,$*))user/ && mkdir $@.core && cd $@.core && ) \
-   $(if $(gb_UITest_use_config), \
-   cp $(gb_UITest_use_config) $(dir $(call 
gb_UITest_get_target,$*))user/user && ) \
$(call gb_CppunitTest_coredumpctl_setup,$@) \
($(gb_UITest_PRECOMMAND) \
$(if $(G_SLICE),G_SLICE=$(G_SLICE)) \

[Libreoffice-commits] core.git: solenv/gbuild

[Mike Kaganski (via logerrit)]

 solenv/gbuild/platform/filter-showIncludes.awk |7 ---
 1 file changed, 7 deletions(-)

New commits:
commit 1bdf64cb4fa0a7bdc50c39c12be0d6897d6eea2f
Author: Mike Kaganski 
AuthorDate: Wed Nov 22 07:44:41 2023 +0100
Commit: Mike Kaganski 
CommitDate: Wed Nov 22 09:01:14 2023 +0100

Drop a redundant CR cleanup

Commit 9166569da389de44075b3d03413b353046a4 (Remove stray
CR from input, 2017-03-09) had introducing the removal of CR
from CRLF generated by MSVC's cl.exe -showIncludes.

Then, commit e9b9a456221b4b0660f90efa1ee092ea00c2c728 (gbuild:
strip away unexpected CR char at the end of Windows filenames,
2017-07-26) added a replacement doing the same, but using a
literal CR instead of "\r". It had in its commit message:

> seen with 2013 on libreoffice-5-2, but there is no
> indication that 2015 on master would be different

libreoffice-5-3-branch-point was tagged on 2016-11-23 (commit
4136757b4e51c4e6f7cb4132c95538a7f831ef2c), so the 5-2 branch
did not contain the former change, and so the premise that
"master would be no different" was likely incorrect.

Change-Id: If992eb826c5d6c2868c9bd706ae51847fe69eda7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159754
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/solenv/gbuild/platform/filter-showIncludes.awk 
b/solenv/gbuild/platform/filter-showIncludes.awk
index 9f5cabd1085b..a5e6e5879a6e 100755
--- a/solenv/gbuild/platform/filter-showIncludes.awk
+++ b/solenv/gbuild/platform/filter-showIncludes.awk
@@ -45,13 +45,6 @@ BEGIN {
 if (index($0, showincludes_prefix) == 1) {
 $0 = substr($0, length(showincludes_prefix) + 1)
 sub(/^ */, "")
-
-# The output from MSVC may contain a carriage return character at the
-# end of filenames, in which case the translation unit will depend on a
-# non-existing header, resulting in constant rebuild of all files,
-# prevent that.
-sub(/
/, "")
-
 gsub(/\\/, "/")
 gsub(/ /, "\\ ")
 if ($0 ~ allowlist) { # filter out system headers

[Libreoffice-commits] core.git: solenv/gbuild

[Stephan Bergmann (via logerrit)]

 solenv/gbuild/CppunitTest.mk |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 533e993f2d11814252c40d60bdab469de03b14db
Author: Stephan Bergmann 
AuthorDate: Fri Nov 17 14:23:41 2023 +0100
Commit: Stephan Bergmann 
CommitDate: Fri Nov 17 16:57:01 2023 +0100

Don't reuse --unit values across (sequential, even) systemd-run invocations

At least some old versions of systemd-run apparently have occasional issues 
when
sequential invocations reuse the same --unit value, as
 now (i.e., after the 
machine was
updated to auto-detect --with-coredumpctl) failed with

> [build CUT] basctl_dialogs_test
> LO_TEST_LOCALE=de
> Running scope as unit: 
-home-tdf-lode-jenkins-workspace-lo_ubsan-workdir-CppunitTest-basctl_dialogs_test.test:20231117013657:704127.scope
[...]
> LO_TEST_LOCALE=en-US
> Running scope as unit: 
-home-tdf-lode-jenkins-workspace-lo_ubsan-workdir-CppunitTest-basctl_dialogs_test.test:20231117013657:704127.scope
[...]
> LO_TEST_LOCALE=fi
> Failed to start transient scope unit: Unit 
-home-tdf-lode-jenkins-workspace-lo_ubsan-workdir-CppunitTest-basctl_dialogs_test.test:20231117013657:704127.scope
 already exists.

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

diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index 18af97e7fff1..adfe49fb 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -27,7 +27,7 @@ gb_CppunitTest_coredumpctl_setup :=
 gb_CppunitTest_coredumpctl_run :=
 else
 gb_CppunitTest_coredumpctl_setup = \
-export LIBO_TEST_UNIT=$$($(SYSTEMD_ESCAPE) "$1:$$(date -u 
+%Y%m%d%H%M%S):" | cut -b -249) &&
+export LIBO_TEST_UNIT=$$($(SYSTEMD_ESCAPE) "$1:$$(date -u 
+%Y%m%d%H%M%S):$(if $2,:$2)" | cut -b -249) &&
 gb_CppunitTest_coredumpctl_run := $(SYSTEMD_RUN) --scope --user 
--unit="$$LIBO_TEST_UNIT"
 endif
 
@@ -135,10 +135,11 @@ else
$(if $(gb_CppunitTest__interactive),, \
$(if $(value gb_CppunitTest_postprocess), \
rm -fr $@.core && mkdir $@.core && cd $@.core 
&&)) \
-   $(call gb_CppunitTest_coredumpctl_setup,$@) \
( \
$(if $(gb_CppunitTest_localized),for l in $(WITH_LANG_LIST) ; 
do \
-   printf 'LO_TEST_LOCALE=%s\n' "$$l" && 
LO_TEST_LOCALE="$$l" ) \
+   printf 'LO_TEST_LOCALE=%s\n' "$$l" && ) \
+   $(call gb_CppunitTest_coredumpctl_setup,$@,$(if 
$(gb_CppunitTest_localized),$$l)) \
+   $(if $(gb_CppunitTest_localized),LO_TEST_LOCALE="$$l") \
$(if $(gb_CppunitTest__vcl_no_svp), \
$(filter-out 
SAL_USE_VCLPLUGIN=svp,$(gb_TEST_ENV_VARS)),$(gb_TEST_ENV_VARS)) \
$(EXTRA_ENV_VARS) \

[Libreoffice-commits] core.git: solenv/gbuild

[Miklos Vajna (via logerrit)]

 solenv/gbuild/UITest.mk |4 
 1 file changed, 4 deletions(-)

New commits:
commit eef9ed1fa7c6b1fcd9dbe2942243e7957f9cdee1
Author: Miklos Vajna 
AuthorDate: Wed Nov 8 21:06:42 2023 +0100
Commit: Miklos Vajna 
CommitDate: Thu Nov 9 08:21:17 2023 +0100

gbuild: remove not needed gb_UITest_use_oneprocess

It's the default. If one wants to opt out, gb_UITest_avoid_oneprocess
should be used.

Change-Id: I52433b20f63c06abf8cb15b8bd26da845ecee00c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159185
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 

diff --git a/solenv/gbuild/UITest.mk b/solenv/gbuild/UITest.mk
index 648d1d4f62a1..5859b9e56de4 100644
--- a/solenv/gbuild/UITest.mk
+++ b/solenv/gbuild/UITest.mk
@@ -136,10 +136,6 @@ define gb_UITest_use_configuration
 $(call gb_UITest_get_target,$(1)) : gb_UITest_use_config := $(2)
 endef
 
-define gb_UITest_use_oneprocess
-$(call gb_UITest_get_target,$(1)) : ONEPROCESS := $(true)
-endef
-
 define gb_UITest_avoid_oneprocess
 $(call gb_UITest_get_target,$(1)) : ONEPROCESS := $(false)
 endef

[Libreoffice-commits] core.git: solenv/gbuild

[Sarper Akdemir (via logerrit)]

 solenv/gbuild/extensions/pre_BuildTools.mk |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit dab20fa2f6cc608a3497ff8d7e756806f8a59932
Author: Sarper Akdemir 
AuthorDate: Tue Nov 7 00:20:31 2023 +0300
Commit: Sarper Akdemir 
CommitDate: Tue Nov 7 09:06:33 2023 +0100

specify the reason for listing zxcvbn-c among build tools

Change-Id: I814cebc6e8ca4815c055ed6f524bfebf08611ccc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159017
Tested-by: Jenkins
Reviewed-by: Sarper Akdemir 

diff --git a/solenv/gbuild/extensions/pre_BuildTools.mk 
b/solenv/gbuild/extensions/pre_BuildTools.mk
index deaaf0b0aff7..c31c809b9993 100644
--- a/solenv/gbuild/extensions/pre_BuildTools.mk
+++ b/solenv/gbuild/extensions/pre_BuildTools.mk
@@ -44,6 +44,8 @@ gb_BUILD_TOOLS_executables_extern = \
 python \
xsltproc \
 
+# zxcvbn-c depends on a generated header by native code, therefore it is built
+# both for the build and the host platform.
 gb_BUILD_TOOLS = \
 $(foreach executable,$(gb_BUILD_TOOLS_executables),$(call 
gb_Executable_get_runtime_dependencies,$(executable))) \
 $(foreach executable,$(gb_BUILD_TOOLS_executables_extern),$(call 
gb_ExternalExecutable_get_dependencies,$(executable))) \

[Libreoffice-commits] core.git: solenv/gbuild

[Mike Kaganski (via logerrit)]

 solenv/gbuild/extensions/post_GbuildToJson.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 8aec57f54b3c6686868a44855c0a0bff339f4835
Author: Mike Kaganski 
AuthorDate: Thu Nov 2 19:52:31 2023 +0300
Commit: Mike Kaganski 
CommitDate: Fri Nov 3 06:03:16 2023 +0100

gbuildtojson: announce every target

vs-ide-integration takes tens of minutes on my system; and most
of the time, it didn't output anything to the terminal. Every
target handled by gbuildtojson takes ~2 s; with more than 870
targets, it makes sense to show the progress to avoid making an
impression of a hang.

The "GBJ" abbreviation (for "gbuildtojson") was not used in the
output before.

Change-Id: I71ab3ae59d1034f47140aad0dab6ed170140acb3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158846
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/solenv/gbuild/extensions/post_GbuildToJson.mk 
b/solenv/gbuild/extensions/post_GbuildToJson.mk
index 2656c1966d0b..080a12837ab7 100644
--- a/solenv/gbuild/extensions/post_GbuildToJson.mk
+++ b/solenv/gbuild/extensions/post_GbuildToJson.mk
@@ -40,6 +40,7 @@ $(gb_GbuildToJson_PHONY):
 
 
 define gb_LinkTarget__command
+$(call gb_Output_announce,$(2),$(true),GBJ,1)
 mkdir -p $(WORKDIR)/GbuildToJson/$(dir $(2))
 mkdir -p $(WORKDIR)/LinkTarget/$(dir $(2))
 $(if 
$(GBUILDTOJSON_LD_LIBRARY_PATH),LD_LIBRARY_PATH=$(GBUILDTOJSON_LD_LIBRARY_PATH))
 \

[Libreoffice-commits] core.git: solenv/gbuild

[Stephan Bergmann (via logerrit)]

 solenv/gbuild/platform/com_MSC_defs.mk |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 0b663a28b47ef3bfff569034e5afcd9b0b1d0f00
Author: Stephan Bergmann 
AuthorDate: Fri Oct 27 11:31:28 2023 +0200
Commit: Stephan Bergmann 
CommitDate: Fri Oct 27 13:28:44 2023 +0200

At least use the oldest available -std:c++14 for MSVC gb_CXX03FLAGS

...if we don't have a proper -std:c++03 available

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

diff --git a/solenv/gbuild/platform/com_MSC_defs.mk 
b/solenv/gbuild/platform/com_MSC_defs.mk
index 0a3df54ce49c..2e7b2728de32 100644
--- a/solenv/gbuild/platform/com_MSC_defs.mk
+++ b/solenv/gbuild/platform/com_MSC_defs.mk
@@ -208,8 +208,9 @@ gb_STDLIBS := \
 gb_CFLAGS_WERROR = $(if $(ENABLE_WERROR),-WX)
 
 # there does not seem to be a way to force C++03 with MSVC, nor with clang-cl 
against MSVC system
-# headers
-gb_CXX03FLAGS :=
+# headers; the oldest version that MSVC supports is C++14, so use that as a 
rather imperfect
+# approximation:
+gb_CXX03FLAGS := -std:c++14
 
 gb_LinkTarget_EXCEPTIONFLAGS := \
-EHs \

[Libreoffice-commits] core.git: solenv/gbuild

[Christian Lohmaier (via logerrit)]

 solenv/gbuild/static.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit af2457dd1f421d657f8d2ad3e2d8493ab9288d4d
Author: Christian Lohmaier 
AuthorDate: Fri Oct 20 18:00:25 2023 +0200
Commit: Christian Lohmaier 
CommitDate: Mon Oct 23 19:16:57 2023 +0200

liborcus(-parser) also needs boost_iostreams - fixes wasm build

not handling that automatically from the info from the regular build is
kinda ugly, probably can be done via RepositoryExternal.mk, but since it
was done that way initially after much tinkering, I don't want to invest
much time into rewriting the static build stuff just to get rid of the
few lines for icu and liborcus 

Change-Id: I2a620426854eb16e2388159bb3bbf1a514872ef9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158267
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/solenv/gbuild/static.mk b/solenv/gbuild/static.mk
index 9b98ec99c593..b6eb9b1fe8cd 100644
--- a/solenv/gbuild/static.mk
+++ b/solenv/gbuild/static.mk
@@ -184,7 +184,7 @@ $(if $(filter-out GBUILD_TOUCHED,$(call 
gb_LinkTarget__get_all_statics,$(1))),
 $(if $(filter icui18n icuuc,$(call gb_LinkTarget__get_all_externals,$(1))),
 $(call gb_LinkTarget_use_externals,$(1),icudata))
 $(if $(filter orcus-parser,$(call gb_LinkTarget__get_all_externals,$(1))),
-$(call gb_LinkTarget_use_static_libraries,$(1),boost_filesystem))
+$(call gb_LinkTarget_use_static_libraries,$(1),boost_filesystem 
boost_iostreams))
 
 $(if $(gb_DEBUG_STATIC),
 $(info gb_LinkTarget__expand_executable libraries for $(call 
gb_LinkTarget__get_workdir_linktargetname,$(1)): $(call 
gb_LinkTarget__get_all_libraries,$(1)))

[Libreoffice-commits] core.git: solenv/gbuild

[Stephan Bergmann (via logerrit)]

 solenv/gbuild/platform/com_MSC_defs.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 19e9fe7c8c89399753ac1730e1c76378b18418bc
Author: Stephan Bergmann 
AuthorDate: Sun Sep 24 18:49:09 2023 +0300
Commit: Stephan Bergmann 
CommitDate: Sun Sep 24 20:58:33 2023 +0200

Adapt a hard-coded value hack

...from 22267b7797340d1eb52ced10fe05afeb8a42fc2b "When building with 
clang-cl,
nevertheless use MSVC's CXXFLAGS_CXX11 for CLR" to
1eef07805021b7ca26a1a8894809b6d995747ba1 "Bump baseline to C++20"

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

diff --git a/solenv/gbuild/platform/com_MSC_defs.mk 
b/solenv/gbuild/platform/com_MSC_defs.mk
index 63e618783e63..0a3df54ce49c 100644
--- a/solenv/gbuild/platform/com_MSC_defs.mk
+++ b/solenv/gbuild/platform/com_MSC_defs.mk
@@ -271,7 +271,7 @@ gb_LTOFLAGS := $(if $(filter TRUE,$(ENABLE_LTO)),-GL)
 # in CLR meta-data - use of this type may lead to a runtime exception":
 gb_CXXCLRFLAGS := \
$(if $(COM_IS_CLANG), \
-   $(patsubst -std=%,-std:c++17 -Zc:__cplusplus,$(gb_CXXFLAGS)), \
+   $(patsubst -std=%,-std:c++20 -Zc:__cplusplus,$(gb_CXXFLAGS)), \
$(gb_CXXFLAGS)) \
$(gb_LinkTarget_EXCEPTIONFLAGS) \
-AI $(INSTDIR)/$(LIBO_URE_LIB_FOLDER) \

[Libreoffice-commits] core.git: solenv/gbuild

[Stephan Bergmann (via logerrit)]

 solenv/gbuild/LinkTarget.mk|   22 +-
 solenv/gbuild/platform/com_GCC_defs.mk |   13 +++--
 solenv/gbuild/platform/com_MSC_defs.mk |   13 +++--
 3 files changed, 31 insertions(+), 17 deletions(-)

New commits:
commit 43939d0b3286266217a2625d5a7a3de1a2cdd303
Author: Stephan Bergmann 
AuthorDate: Wed Aug 23 22:11:30 2023 +0200
Commit: Stephan Bergmann 
CommitDate: Mon Aug 28 14:50:13 2023 +0200

Do a real compile after a successful COMPILER_PLUGIN_TOOL=... compile

...so that object files are generated after all, even though the
COMPILER_PLUGIN_TOOL=... compile itself doesn't generate them.

(This required the existing gb_COMPILER_PLUGIN variable to be 
disambiguated, by
splitting off a new gb_COMPILER_PLUGINS_TOOL variable.)

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

diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 9bf4cacf2b8a..85139659c634 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -98,7 +98,7 @@ $(call gb_Helper_abbreviate_dirs,\
$(T_LTOFLAGS) \
$(if $(VISIBILITY),,$(gb_VISIBILITY_FLAGS)) \
$(if $(WARNINGS_NOT_ERRORS),$(if $(ENABLE_WERROR),$(if 
$(PLUGIN_WARNINGS_AS_ERRORS),$(gb_COMPILER_PLUGINS_WARNINGS_AS_ERRORS))),$(gb_CFLAGS_WERROR))
 \
-   $(if $(3),$(gb_COMPILER_PLUGINS)) \
+   $(if $(3),$(gb_COMPILER_PLUGINS_TOOL)) \
$(T_CFLAGS) $(T_CFLAGS_APPEND) \
$(if 
$(EXTERNAL_CODE),$(gb_CXXFLAGS_Wundef),$(gb_DEFS_INTERNAL)) \
-c $(2) \
@@ -113,7 +113,7 @@ $(call gb_Helper_abbreviate_dirs,\
$(T_LTOFLAGS) \
$(if $(VISIBILITY),,$(gb_VISIBILITY_FLAGS)) \
$(if $(WARNINGS_NOT_ERRORS),$(if $(ENABLE_WERROR),$(if 
$(PLUGIN_WARNINGS_AS_ERRORS),$(gb_COMPILER_PLUGINS_WARNINGS_AS_ERRORS))),$(gb_CFLAGS_WERROR))
 \
-   $(if $(3),$(gb_COMPILER_PLUGINS)) \
+   $(if $(3),$(gb_COMPILER_PLUGINS_TOOL)) \
$(T_OBJCFLAGS) $(T_OBJCFLAGS_APPEND) \
$(if 
$(EXTERNAL_CODE),$(gb_CXXFLAGS_Wundef),$(gb_DEFS_INTERNAL)) \
-c $(2) \
@@ -128,7 +128,7 @@ $(call gb_Helper_abbreviate_dirs,\
$(T_LTOFLAGS) \
$(if $(VISIBILITY),,$(gb_VISIBILITY_FLAGS)) \
$(if $(WARNINGS_NOT_ERRORS),$(if $(ENABLE_WERROR),$(if 
$(PLUGIN_WARNINGS_AS_ERRORS),$(gb_COMPILER_PLUGINS_WARNINGS_AS_ERRORS))),$(gb_CFLAGS_WERROR))
 \
-   $(if $(3),$(gb_COMPILER_PLUGINS)) \
+   $(if $(3),$(gb_COMPILER_PLUGINS_TOOL)) \
$(T_CXXFLAGS) $(T_CXXFLAGS_APPEND) \
$(if 
$(EXTERNAL_CODE),$(gb_CXXFLAGS_Wundef),$(gb_DEFS_INTERNAL)) \
-c $(2) \
@@ -143,7 +143,7 @@ $(call gb_Helper_abbreviate_dirs,\
$(T_LTOFLAGS) \
$(if $(VISIBILITY),,$(gb_VISIBILITY_FLAGS)) \
$(if $(WARNINGS_NOT_ERRORS),$(if $(ENABLE_WERROR),$(if 
$(PLUGIN_WARNINGS_AS_ERRORS),$(gb_COMPILER_PLUGINS_WARNINGS_AS_ERRORS))),$(gb_CFLAGS_WERROR))
 \
-   $(if $(3),$(gb_COMPILER_PLUGINS)) \
+   $(if $(3),$(gb_COMPILER_PLUGINS_TOOL)) \
$(T_OBJCXXFLAGS) $(T_OBJCXXFLAGS_APPEND) \
$(if 
$(EXTERNAL_CODE),$(gb_CXXFLAGS_Wundef),$(gb_DEFS_INTERNAL)) \
-c $(2) \
@@ -158,7 +158,7 @@ $(call gb_Helper_abbreviate_dirs,\
$(T_LTOFLAGS) \
$(if $(VISIBILITY),,$(gb_VISIBILITY_FLAGS)) \
$(if $(WARNINGS_NOT_ERRORS),$(if $(ENABLE_WERROR),$(if 
$(PLUGIN_WARNINGS_AS_ERRORS),$(gb_COMPILER_PLUGINS_WARNINGS_AS_ERRORS))),$(gb_CFLAGS_WERROR))
 \
-   $(if $(3),$(gb_COMPILER_PLUGINS)) \
+   $(if $(3),$(gb_COMPILER_PLUGINS_TOOL)) \
$(T_CXXCLRFLAGS) $(T_CXXCLRFLAGS_APPEND) \
$(if 
$(EXTERNAL_CODE),$(gb_CXXFLAGS_Wundef),$(gb_DEFS_INTERNAL)) \
-c $(2) \
@@ -266,6 +266,7 @@ $(call gb_CObject_get_target,%) : $(call 
gb_CObject_get_source,$(SRCDIR),%) $(gb
$(call gb_Output_announce,$*.c,$(true),C  ,3)
$(call gb_Trace_StartRange,$*.c,C  )
$(if $(call gb_LinkTarget__tool_compile_enabled),$(call 
gb_CObject__tool_command,$*,$<,$(COMPILER_PLUGINS)))
+   $(if $(call gb_LinkTarget__tool_compile_enabled),$(if 
$(COMPILER_PLUGIN_TOOL),$(call gb_CObject__command_pattern,$@,$(T_CFLAGS) 
$(T_CFLAGS_APPEND),$<,$(call 
gb_CObject_get_dep_target,$*),$(COMPILER_PLUGINS),$(T_CC
$(call gb_Trace_EndRange,$*.c,C  )
 else
 $(call gb_CObject_get_target,%) : $(call gb_CObject_get_source,$(SRCDIR),%)
@@ -328,6 +329,8 @@ $(call gb_CxxObject_get_target,%) : $(call 
gb_CxxObject_get_source,$(SRCDIR),%)
$(call gb_Output_announce,$*.cxx,$(true),CXX,3)
$(call 

[Libreoffice-commits] core.git: solenv/gbuild

[Hossein (via logerrit)]

 solenv/gbuild/platform/com_MSC_class.mk |8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 0c9f095a01682d8cb99a596e568bd81ae96906a5
Author: Hossein 
AuthorDate: Thu May 25 15:55:11 2023 +0200
Commit: Hossein 
CommitDate: Wed Aug 9 10:15:16 2023 +0200

tdf#155446 Fix problem with ccache on Windows

This patch fixes the recent problem with building LibreOffice with ccache
on Windows which was caused by the lack of double quotation mark between
ccache.exe and path to the MSVC compiler.

Change-Id: I1a714513ccb8cd674895d0c887013ea862d3b544
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152277
Tested-by: Jenkins
Reviewed-by: Hossein 

diff --git a/solenv/gbuild/platform/com_MSC_class.mk 
b/solenv/gbuild/platform/com_MSC_class.mk
index ba42b0ba48df..d8cab84ff7c7 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -179,7 +179,7 @@ define gb_AsmObject__command
 $(call gb_Output_announce,$(2),$(true),ASM,3)
 $(call gb_Helper_abbreviate_dirs,\
 mkdir -p $(dir $(1)) $(dir $(4)) && \
-"$(CC)" -nologo -EP -D_M_ARM64 $(SOLARINC) $(3) > $(subst .o,.asm,$(1)) && 
\
+$(CC) -nologo -EP -D_M_ARM64 $(SOLARINC) $(3) > $(subst .o,.asm,$(1)) && \
 "$(ML_EXE)" $(gb_AFLAGS) -g -errorReport:prompt -o $(1) $(subst 
.o,.asm,$(1)), \
 ) && \
 echo "$(1) : $(3)" > $(4)
@@ -664,8 +664,12 @@ gb_AUTOCONF_WRAPPERS = \
 gb_ExternalProject_INCLUDE := \
$(subst -I,,$(subst $(WHITESPACE),;,$(SOLARINC)))
 
+# Workaround for openssl build - it puts the CC var into additional pair of 
quotes. This breaks if
+# CC consists of more than a single element such as when using "ccache 
compiler". In case the
+# variables are exported for openssl, it closes and reopens the quotes after 
each element.
 gb_NMAKE_VARS = \
-   CC="$(shell cygpath -w $(filter-out -%,$(CC))) $(filter -%,$(CC))" \
+   CC="$(subst $(WHITESPACE),$(if $(filter openssl,$(1)),\" \", ),$(strip \
+   $(shell cygpath -ws $(filter-out -%,$(CC))) $(filter 
-%,$(CC" \
INCLUDE="$(gb_ExternalProject_INCLUDE)" \
LIB="$(ILIB)" \
MAKEFLAGS= \

[Libreoffice-commits] core.git: solenv/gbuild

[Stephan Bergmann (via logerrit)]

 solenv/gbuild/platform/com_MSC_defs.mk |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit 33eb52e005eb67856137475ff761ce4df006bd57
Author: Stephan Bergmann 
AuthorDate: Mon Jul 17 17:16:03 2023 +0200
Commit: Stephan Bergmann 
CommitDate: Tue Jul 18 08:14:20 2023 +0200

MSVC: Silence C++23 std::numeric_limits::has_denorm deprecation warning

...as seen at least when building against VS 2022 Preview 17.7.0 Preview 
3.0 and
--with-latest-c++,

> [build CXX] connectivity/source/commontools/RowFunctionParser.cxx
> 
workdir\UnpackedTarball\boost\boost/spirit/home/classic/core/primitives/impl/numerics.ipp(199):
 error C2220: the following warning is treated as an error
> 
workdir\UnpackedTarball\boost\boost/spirit/home/classic/core/primitives/impl/numerics.ipp(199):
 warning C4996: 'std::_Num_base::has_denorm': warning STL4042: 
std::float_denorm_style, std::numeric_limits::has_denorm, and 
std::numeric_limits::has_denorm_loss are deprecated in C++23. You can define 
_SILENCE_CXX23_DENORM_DEPRECATION_WARNING or 
_SILENCE_ALL_CXX23_DEPRECATION_WARNINGS to suppress this warning.
> 
workdir\UnpackedTarball\boost\boost/spirit/home/classic/core/primitives/impl/numerics.ipp(193):
 note: while compiling class template member function 'bool 
boost::spirit::classic::impl::negative_accumulate::add(T &,T)'
> with
> [
> T=int
> ]
[...]

etc.

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

diff --git a/solenv/gbuild/platform/com_MSC_defs.mk 
b/solenv/gbuild/platform/com_MSC_defs.mk
index ad425e9b5fdd..407ca991007d 100644
--- a/solenv/gbuild/platform/com_MSC_defs.mk
+++ b/solenv/gbuild/platform/com_MSC_defs.mk
@@ -40,6 +40,11 @@ ifneq ($(origin CXX),default)
 gb_CXX := $(CXX)
 endif
 
+# _SILENCE_CXX23_DENORM_DEPRECATION_WARNING is needed at least with Boost 
1.82.0 using
+# std::numeric_limits::has_denorm in
+# 
workdir/UnpackedTarball/boost/boost/spirit/home/classic/core/primitives/impl/numerics.ipp,
 in turn
+# included from boost/spirit/include/classic_core.hpp as included from various 
of our code files:
+
 # _SCL_SECURE_NO_WARNINGS avoids deprecation warnings for STL algorithms
 # like std::copy, std::transform (when MSVC_USE_DEBUG_RUNTIME is enabled)
 
@@ -50,6 +55,7 @@ gb_COMPILERDEFS := \
-D_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING \
-D_SILENCE_CXX17_OLD_ALLOCATOR_MEMBERS_DEPRECATION_WARNING \
-D_SILENCE_CXX17_RESULT_OF_DEPRECATION_WARNING \
+   -D_SILENCE_CXX23_DENORM_DEPRECATION_WARNING \
-D_CRT_NON_CONFORMING_SWPRINTFS \
-D_CRT_NONSTDC_NO_DEPRECATE \
-D_CRT_SECURE_NO_DEPRECATE \

[Libreoffice-commits] core.git: solenv/gbuild sw/UITest_sw_styleInspector.mk uitest/test_main.py uitest/uitest

[Miklos Vajna (via logerrit)]

 solenv/gbuild/UITest.mk|6 ++
 sw/UITest_sw_styleInspector.mk |2 ++
 uitest/test_main.py|   12 ++--
 uitest/uitest/framework.py |   28 
 uitest/uitest/test.py  |   13 -
 5 files changed, 50 insertions(+), 11 deletions(-)

New commits:
commit f5d97d14a2169c23b801d5d09ea19c001d36bba1
Author: Miklos Vajna 
AuthorDate: Mon Mar 20 08:14:13 2023 +0100
Commit: Miklos Vajna 
CommitDate: Mon Mar 20 12:40:22 2023 +

uitest: add a way to optionally use the same soffice process for a testsuite

A uitest suite may have several testcases and we spend a lot of time
spinning up a new soffice process for each testcase, while we typically
do such initialization only once for per testsuites in the cppunit case,
slowing down uitests.

The problem is that this way today's uitest cases don't really have to
clean up after themselves, since they know that the next testcase will
gets its own clean state (back to the start center).

Fix the problem by adding an opt-in way, so that a uitest suite can
declare that it's safe to run the entire suite with the same soffice
process. To be more specific:
- add a new --oneprocess for test_main.py, which will create a shared
  connection to a soffice process
- UITest then closes the document (returning to the start center)
  instead of disposing the component in the oneprocess case
- UITestCase won't create its own soffice connection in the oneprocess
  case
- add a new gb_UITest_use_oneprocess method to gbuild, to request this
  new, faster behavior
E.g. on my machine this means UITest_sw_styleInspector takes 26,345s
instead of 40,652s, probably such a speedup is worth the added
complexity.

This works nicely when the testsuite is a list of simple/boring test
cases, always loading one component/document at a time and always using
close_doc() to close it. It may not be safe for testsuites that do
something special (they may fail or hang), we'll see.

Change-Id: Ib14439d48aa547c92652245ee1c0cf37d2d7b6e7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149134
Reviewed-by: Noel Grandin 
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 

diff --git a/solenv/gbuild/UITest.mk b/solenv/gbuild/UITest.mk
index 0a08939239b8..3b78b1356d90 100644
--- a/solenv/gbuild/UITest.mk
+++ b/solenv/gbuild/UITest.mk
@@ -80,6 +80,7 @@ else
$(gb_TEST_ENV_VARS) \
$(gb_UITest_COMMAND) \
--soffice="$(gb_UITest_SOFFICEARG)" \
+   $(if $(ONEPROCESS),--oneprocess) \
--userdir=$(call gb_Helper_make_url,$(dir $(call 
gb_UITest_get_target,$*))user) \
--dir=$(strip $(MODULES)) \
$(gb_UITest_GDBTRACE) \
@@ -104,6 +105,7 @@ $(call gb_UITest_get_target,$(1)) : MODULES :=
 $(eval $(call gb_TestHelpers_use_more_fonts,$(call gb_UITest_get_target,$(1
 $(eval $(call gb_Module_register_target,$(call 
gb_UITest_get_target,$(1)),$(call gb_UITest_get_clean_target,$(1
 $(call gb_Helper_make_userfriendly_targets,$(1),UITest)
+$(call gb_UITest_get_target,$(1)) : ONEPROCESS := $(false)
 
 endef
 
@@ -133,6 +135,10 @@ define gb_UITest_use_configuration
 $(call gb_UITest_get_target,$(1)) : gb_UITest_use_config := $(2)
 endef
 
+define gb_UITest_use_oneprocess
+$(call gb_UITest_get_target,$(1)) : ONEPROCESS := $(true)
+endef
+
 
 else # DISABLE_PYTHON
 
diff --git a/sw/UITest_sw_styleInspector.mk b/sw/UITest_sw_styleInspector.mk
index d255dfbd756f..667482649619 100644
--- a/sw/UITest_sw_styleInspector.mk
+++ b/sw/UITest_sw_styleInspector.mk
@@ -14,3 +14,5 @@ $(eval $(call 
gb_UITest_add_modules,sw_styleInspector,$(SRCDIR)/sw/qa/uitest,\
 $(eval $(call gb_UITest_set_defs,sw_styleInspector, \
 TDOC="$(SRCDIR)/sw/qa/uitest/data" \
 ))
+
+$(eval $(call gb_UITest_use_oneprocess,sw_styleInspector))
diff --git a/uitest/test_main.py b/uitest/test_main.py
index 511f2a5c8bd4..1957f54dc373 100644
--- a/uitest/test_main.py
+++ b/uitest/test_main.py
@@ -16,12 +16,13 @@ import types
 from uitest.framework import UITestCase
 
 from libreoffice.connection import OfficeConnection
+from libreoffice.connection import PersistentConnection
 
 test_name_limit_found = False
 
 def parseArgs(argv):
 (optlist,args) = getopt.getopt(argv[1:], "hr",
-["help", "soffice=", "userdir=", "dir=", "file=", "gdb"])
+["help", "soffice=", "oneprocess", "userdir=", "dir=", "file=", 
"gdb"])
 return (dict(optlist), args)
 
 def usage():
@@ -94,7 +95,7 @@ def add_tests_for_file(test_file, test_suite):
 continue
 test_name_limit_found = True
 
-obj = c(test_name, opts)
+obj = c(test_name, opts, connection)
 test_suite.addTest(obj)
 
 def get_test_suite_for_dir(opts):
@@ -108,6 +109,10 @@ def get_test_suite_for_dir(opts):
 

[Libreoffice-commits] core.git: solenv/gbuild

[Tor Lillqvist (via logerrit)]

 solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 49445ccb891c6eb85b1d644c975c1b092ef00e43
Author: Tor Lillqvist 
AuthorDate: Mon Feb 13 14:54:24 2023 +0200
Commit: Tor Lillqvist 
CommitDate: Thu Feb 16 21:27:14 2023 +

Use -O3 for Emscripten, seems to work

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

diff --git a/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk 
b/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk
index 4ae925daf5d1..a69539b65403 100644
--- a/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk
@@ -71,6 +71,8 @@ ifeq ($(HAVE_EXTERNAL_DWARF),TRUE)
 gb_DEBUGINFO_FLAGS += -gseparate-dwarf
 endif
 
+gb_COMPILEROPTFLAGS := -O3
+
 # We need at least code elimination, otherwise linking OOMs even with 64GB.
 # So we "fake" -Og support to mean -O1 for Emscripten and always enable it for 
debug in configure.
 gb_COMPILERDEBUGOPTFLAGS := -O1

[Libreoffice-commits] core.git: solenv/gbuild

[Tor Lillqvist (via logerrit)]

 solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk |4 
 1 file changed, 4 insertions(+)

New commits:
commit 21e9ebb75b284b140b892f6f69a779d5277044d8
Author: Tor Lillqvist 
AuthorDate: Thu Feb 16 13:20:53 2023 +0200
Commit: Tor Lillqvist 
CommitDate: Thu Feb 16 11:35:39 2023 +

Add comment about using WASM exceptions

Change-Id: I402bf56b89b3a18f854331915f827f7512fb05e4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147152
Tested-by: Tor Lillqvist 
Reviewed-by: Tor Lillqvist 

diff --git a/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk 
b/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk
index fa7b51e54cc4..4ae925daf5d1 100644
--- a/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk
@@ -32,6 +32,10 @@ gb_EMSCRIPTEN_QTDEFS := -DQT_NO_LINKED_LIST 
-DQT_NO_JAVA_STYLE_ITERATORS -DQT_NO
 
 gb_Executable_EXT := .html
 ifeq ($(ENABLE_WASM_EXCEPTIONS),TRUE)
+# Note that to really use WASM exceptions everywhere, you most probably want 
to also use
+# CC=emcc -pthread -s USE_PTHREADS=1 -fwasm-exceptions -s SUPPORT_LONGJMP=wasm
+# and CXX=em++ -pthread -s USE_PTHREADS=1 -fwasm-exceptions -s 
SUPPORT_LONGJMP=wasm
+# in your autogen.input. Otherwise these flags won't propagate to all external 
libraries, I fear.
 gb_EMSCRIPTEN_EXCEPT = -fwasm-exceptions -s SUPPORT_LONGJMP=wasm
 gb_EMSCRIPTEN_CPPFLAGS += -s SUPPORT_LONGJMP=wasm
 else

[Libreoffice-commits] core.git: solenv/gbuild

[Tor Lillqvist (via logerrit)]

 solenv/gbuild/platform/com_GCC_defs.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6e2d28934e273386e2f56a4eef0a9f03fa5d5c7d
Author: Tor Lillqvist 
AuthorDate: Tue Jan 24 17:19:27 2023 +0200
Commit: Tor Lillqvist 
CommitDate: Tue Jan 24 15:21:31 2023 +

Clarify comment

Change-Id: I33d10ea4f3ca35619d6f857d18b5c53a22d822a7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146097
Tested-by: Tor Lillqvist 
Reviewed-by: Tor Lillqvist 

diff --git a/solenv/gbuild/platform/com_GCC_defs.mk 
b/solenv/gbuild/platform/com_GCC_defs.mk
index 3a14e841bc97..89e717ccd15a 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -280,7 +280,7 @@ endif
 
 # For Emscripten, the emcc command is a Python script that outputs annoying 
warnings like
 # .../emscripten/tools/building.py:638: ResourceWarning: unclosed file 
<_io.TextIOWrapper name='/tmp/emscripten_temp_0fvvg__1/conftest.js.jso.js' 
mode='w' encoding='utf-8'>
-# into stderr, which makes the configure script think that there is a problem 
in
+# into stderr, which makes a configure script think that there is a problem in
 # compiling even a microscopic test program with an option like -Werror which
 # surely *is* supported. Avoid this by setting PYTHONWARNINGS=ignore.
 

[Libreoffice-commits] core.git: solenv/gbuild

[Tor Lillqvist (via logerrit)]

 solenv/gbuild/platform/com_GCC_defs.mk |   13 ++---
 1 file changed, 10 insertions(+), 3 deletions(-)

New commits:
commit e37a4598bbfcc4359fb13e362888b5fe29a997ef
Author: Tor Lillqvist 
AuthorDate: Tue Jan 24 13:09:42 2023 +0200
Commit: Tor Lillqvist 
CommitDate: Tue Jan 24 15:11:49 2023 +

Use PYTHONWARNINGS=ignore instead of 'default' for Emscripten

The Emscripten compiler, emcc is a Python script that wraps the actual
compiler. It outputs annoying warnings like

.../emscripten/tools/building.py:638: ResourceWarning: unclosed file 
<_io.TextIOWrapper name='/tmp/emscripten_temp_0fvvg__1/conftest.js.jso.js' 
mode='w' encoding='utf-8'>

to stderr. (Ditto for em++.) Some steps in typical configure script
think that a non-empty stderr means there was a problem in compiling a
test program. This happens even for a microscopic test program with an
option like -Werror which surely *is* supported.  Avoid this by
setting PYTHONWARNINGS=ignore.

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

diff --git a/solenv/gbuild/platform/com_GCC_defs.mk 
b/solenv/gbuild/platform/com_GCC_defs.mk
index 0cbe852539c9..3a14e841bc97 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -275,9 +275,16 @@ endif
 ifeq ($(COMPILER_PLUGINS_DEBUG),TRUE)
 gb_COMPILER_PLUGINS += -Xclang -plugin-arg-loplugin -Xclang --debug
 endif
-# set CCACHE_CPP2=1 to prevent clang generating spurious warnings
-# clear PYTHONWARNINGS to prevent noise from emscripten implementation
-gb_COMPILER_SETUP += CCACHE_CPP2=1 $(if $(filter 
EMSCRIPTEN,$(OS)),PYTHONWARNINGS=default)
+
+# Set CCACHE_CPP2=1 to prevent Clang generating spurious warnings.
+
+# For Emscripten, the emcc command is a Python script that outputs annoying 
warnings like
+# .../emscripten/tools/building.py:638: ResourceWarning: unclosed file 
<_io.TextIOWrapper name='/tmp/emscripten_temp_0fvvg__1/conftest.js.jso.js' 
mode='w' encoding='utf-8'>
+# into stderr, which makes the configure script think that there is a problem 
in
+# compiling even a microscopic test program with an option like -Werror which
+# surely *is* supported. Avoid this by setting PYTHONWARNINGS=ignore.
+
+gb_COMPILER_SETUP += CCACHE_CPP2=1 $(if $(filter 
EMSCRIPTEN,$(OS)),PYTHONWARNINGS=ignore)
 gb_COMPILER_PLUGINS_SETUP := 
ICECC_EXTRAFILES=$(SRCDIR)/include/sal/log-areas.dox 
CCACHE_EXTRAFILES=$(SRCDIR)/include/sal/log-areas.dox 
SCCACHE_EXTRAFILES=$(SRCDIR)/include/sal/log-areas.dox
 gb_COMPILER_PLUGINS_WARNINGS_AS_ERRORS := \
 -Xclang -plugin-arg-loplugin -Xclang --warnings-as-errors

[Libreoffice-commits] core.git: solenv/gbuild

[Tor Lillqvist (via logerrit)]

 solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 36c492bb01f48435b714fc85b203c1e8a2fa8d07
Author: Tor Lillqvist 
AuthorDate: Mon Jan 23 17:02:07 2023 +0200
Commit: Tor Lillqvist 
CommitDate: Mon Jan 23 20:18:35 2023 +

Bin line that was commented-out in December 2021

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

diff --git a/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk 
b/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk
index fdce92af0abe..fa7b51e54cc4 100644
--- a/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk
@@ -62,7 +62,6 @@ gb_LINKERSTRIPDEBUGFLAGS :=
 # This maps to g3, no source maps, but DWARF with current emscripten!
 # https://developer.chrome.com/blog/wasm-debugging-2020/
 gb_DEBUGINFO_FLAGS = -g
-#gb_DEBUGINFO_FLAGS = -gsource-map 
--source-map-base=file://$(WORKDIR)/LinkTarget/Executable
 
 ifeq ($(HAVE_EXTERNAL_DWARF),TRUE)
 gb_DEBUGINFO_FLAGS += -gseparate-dwarf

[Libreoffice-commits] core.git: solenv/gbuild

[Tor Lillqvist (via logerrit)]

 solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk |8 
 1 file changed, 8 insertions(+)

New commits:
commit d648f2ae3a16d0613d1b75848789b9742eb20b19
Author: Tor Lillqvist 
AuthorDate: Mon Jan 16 23:16:53 2023 +0200
Commit: Tor Lillqvist 
CommitDate: Tue Jan 17 07:57:12 2023 +

Adapt for --enable-wasm-exceptions

Actually, it seems that to build core with --fwasm-exceptions for use
in a LibreOffice Technology -using WASM executable, you need to
compile *everything* with that (i.e. *all* of core's externals). Just
these gbuild things are not enough to ensure that. You have to put

  CC=emcc -pthread -fwasm-exceptions -s SUPPORT_LONGJMP=wasm
  CXX=em++ -pthread -fwasm-exceptions -s SUPPORT_LONGJMP=wasm

into your autogen.input.

Change-Id: I10d21ad0f73e7e5d72864864d595077bd770f4f6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145646
Reviewed-by: Tor Lillqvist 
Tested-by: Tor Lillqvist 

diff --git a/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk 
b/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk
index 8831aeeb5d54..fdce92af0abe 100644
--- a/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk
@@ -39,7 +39,15 @@ gb_EMSCRIPTEN_EXCEPT = -s DISABLE_EXCEPTION_CATCHING=0
 endif
 
 gb_CXXFLAGS += $(gb_EMSCRIPTEN_CPPFLAGS)
+
+ifeq ($(ENABLE_WASM_EXCEPTIONS),TRUE)
+# Here we don't use += because gb_LinkTarget_EXCEPTIONFLAGS from 
com_GCC_defs.mk contains -fexceptions and
+# gb_EMSCRIPTEN_EXCEPT already has -fwasm-exceptions
+gb_LinkTarget_EXCEPTIONFLAGS = $(gb_EMSCRIPTEN_EXCEPT)
+else
 gb_LinkTarget_EXCEPTIONFLAGS += $(gb_EMSCRIPTEN_EXCEPT)
+endif
+
 gb_LinkTarget_CFLAGS += $(gb_EMSCRIPTEN_CPPFLAGS)
 gb_LinkTarget_CXXFLAGS += $(gb_EMSCRIPTEN_CPPFLAGS) $(gb_EMSCRIPTEN_EXCEPT)
 ifeq ($(ENABLE_QT5),TRUE)

[Libreoffice-commits] core.git: solenv/gbuild solenv/inc

[Tor Lillqvist (via logerrit)]

 solenv/gbuild/platform/com_GCC_defs.mk |1 -
 solenv/gbuild/platform/com_MSC_defs.mk |1 -
 solenv/inc/doxygen.cfg |1 -
 solenv/inc/doxygen_doc.cfg |1 -
 solenv/inc/doxygen_tag.cfg |1 -
 5 files changed, 5 deletions(-)

New commits:
commit ef3c34596ebc6e6e3b85c4093a28d48fe328c1a7
Author: Tor Lillqvist 
AuthorDate: Fri Jan 13 11:43:39 2023 +0200
Commit: Tor Lillqvist 
CommitDate: Sat Jan 14 12:09:53 2023 +

EXCEPTIONS_ON has no meaning

Change-Id: I0ca0dcb76d342b451879788b57da03fb7d79e699
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145456
Tested-by: Tor Lillqvist 
Reviewed-by: Tor Lillqvist 

diff --git a/solenv/gbuild/platform/com_GCC_defs.mk 
b/solenv/gbuild/platform/com_GCC_defs.mk
index 6eeda2fc03ab..0cbe852539c9 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -205,7 +205,6 @@ endif
 endif
 
 gb_LinkTarget_EXCEPTIONFLAGS := \
-   -DEXCEPTIONS_ON \
-fexceptions
 
 ifeq ($(gb_ENABLE_DBGUTIL),$(false))
diff --git a/solenv/gbuild/platform/com_MSC_defs.mk 
b/solenv/gbuild/platform/com_MSC_defs.mk
index 928fd3400af1..ad425e9b5fdd 100644
--- a/solenv/gbuild/platform/com_MSC_defs.mk
+++ b/solenv/gbuild/platform/com_MSC_defs.mk
@@ -206,7 +206,6 @@ gb_CFLAGS_WERROR = $(if $(ENABLE_WERROR),-WX)
 gb_CXX03FLAGS :=
 
 gb_LinkTarget_EXCEPTIONFLAGS := \
-   -DEXCEPTIONS_ON \
-EHs \
 
 gb_PrecompiledHeader_EXCEPTIONFLAGS := $(gb_LinkTarget_EXCEPTIONFLAGS)
diff --git a/solenv/inc/doxygen.cfg b/solenv/inc/doxygen.cfg
index 2bdabc731935..ed50d426549e 100644
--- a/solenv/inc/doxygen.cfg
+++ b/solenv/inc/doxygen.cfg
@@ -2017,7 +2017,6 @@ PREDEFINED = LINUX \
  DBG_UTIL \
  OSL_DEBUG_LEVEL=2 \
  CUI \
- EXCEPTIONS_ON \
  DOXYGEN_ONLY
 
 # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
diff --git a/solenv/inc/doxygen_doc.cfg b/solenv/inc/doxygen_doc.cfg
index dfcf174ee559..78d2778f7a4b 100644
--- a/solenv/inc/doxygen_doc.cfg
+++ b/solenv/inc/doxygen_doc.cfg
@@ -2017,7 +2017,6 @@ PREDEFINED = LINUX \
  DBG_UTIL \
  OSL_DEBUG_LEVEL=2 \
  CUI \
- EXCEPTIONS_ON \
  DOXYGEN_ONLY
 
 # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
diff --git a/solenv/inc/doxygen_tag.cfg b/solenv/inc/doxygen_tag.cfg
index a2f2e602612b..1ba9c17cdbfc 100644
--- a/solenv/inc/doxygen_tag.cfg
+++ b/solenv/inc/doxygen_tag.cfg
@@ -2017,7 +2017,6 @@ PREDEFINED = LINUX \
  DBG_UTIL \
  OSL_DEBUG_LEVEL=2 \
  CUI \
- EXCEPTIONS_ON \
  DOXYGEN_ONLY
 
 # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this

[Libreoffice-commits] core.git: solenv/gbuild

[Tor Lillqvist (via logerrit)]

 solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk |   12 
 1 file changed, 8 insertions(+), 4 deletions(-)

New commits:
commit 67471b3a7fb33884e70e29163b4eddf47fa85115
Author: Tor Lillqvist 
AuthorDate: Wed Jan 11 17:39:06 2023 +0200
Commit: Tor Lillqvist 
CommitDate: Wed Jan 11 22:49:45 2023 +

Use gb_EMSCRIPTEN_QTDEFS only when building with Qt5

Move -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE to gb_EMSCRIPTEN_CPPFLAGS.

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

diff --git a/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk 
b/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk
index b0629894a07e..8831aeeb5d54 100644
--- a/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk
@@ -18,7 +18,7 @@ gb_EMSCRIPTEN_PRE_JS_FILES = \
 
 gb_RUN_CONFIGURE := $(SRCDIR)/solenv/bin/run-configure
 # avoid -s SAFE_HEAP=1 - c.f. gh#8584 this breaks source maps
-gb_EMSCRIPTEN_CPPFLAGS := -pthread -s USE_PTHREADS=1
+gb_EMSCRIPTEN_CPPFLAGS := -pthread -s USE_PTHREADS=1 -D_LARGEFILE64_SOURCE 
-D_LARGEFILE_SOURCE
 gb_EMSCRIPTEN_LDFLAGS := $(gb_EMSCRIPTEN_CPPFLAGS)
 
 # Initial memory size and worker thread pool
@@ -28,7 +28,7 @@ gb_EMSCRIPTEN_LDFLAGS += -s TOTAL_MEMORY=1GB -s 
PTHREAD_POOL_SIZE=4
 # See emscripten.py, finalize_wasm, modify_wasm = True
 # So we need WASM_BIGINT=1 and ASSERTIONS=1 (2 implies STACK_OVERFLOW_CHECK)
 gb_EMSCRIPTEN_LDFLAGS += --bind -s FORCE_FILESYSTEM=1 -s WASM_BIGINT=1 -s 
ERROR_ON_UNDEFINED_SYMBOLS=1 -s FETCH=1 -s ASSERTIONS=1 -s EXIT_RUNTIME=0 -s 
EXPORTED_RUNTIME_METHODS=["UTF16ToString","stringToUTF16","UTF8ToString","allocateUTF8","printErr","ccall","cwrap"]
-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_EMSCRIPTEN_QTDEFS := -DQT_NO_LINKED_LIST -DQT_NO_JAVA_STYLE_ITERATORS 
-DQT_NO_EXCEPTIONS -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB
 
 gb_Executable_EXT := .html
 ifeq ($(ENABLE_WASM_EXCEPTIONS),TRUE)
@@ -40,8 +40,12 @@ 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_CFLAGS += $(gb_EMSCRIPTEN_CPPFLAGS)
+gb_LinkTarget_CXXFLAGS += $(gb_EMSCRIPTEN_CPPFLAGS) $(gb_EMSCRIPTEN_EXCEPT)
+ifeq ($(ENABLE_QT5),TRUE)
+gb_LinkTarget_CFLAGS += $(gb_EMSCRIPTEN_QTDEFS)
+gb_LinkTarget_CXXFLAGS += $(gb_EMSCRIPTEN_QTDEFS)
+endif
 gb_LinkTarget_LDFLAGS += $(gb_EMSCRIPTEN_LDFLAGS) $(gb_EMSCRIPTEN_CPPFLAGS) 
$(gb_EMSCRIPTEN_EXCEPT)
 
 # Linker and compiler optimize + debug flags are handled in LinkTarget.mk

[Libreoffice-commits] core.git: solenv/gbuild

[Stephan Bergmann (via logerrit)]

 solenv/gbuild/UnoApiTarget.mk |8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

New commits:
commit 9fdf6b4d8317df2a6ccc866fad93292b41c97274
Author: Stephan Bergmann 
AuthorDate: Mon Jan 2 08:35:28 2023 +0100
Commit: Stephan Bergmann 
CommitDate: Tue Jan 3 07:14:15 2023 +

More verbose unoidl-check errors

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

diff --git a/solenv/gbuild/UnoApiTarget.mk b/solenv/gbuild/UnoApiTarget.mk
index 25a53dfa0a59..67e8bccca906 100644
--- a/solenv/gbuild/UnoApiTarget.mk
+++ b/solenv/gbuild/UnoApiTarget.mk
@@ -35,9 +35,11 @@ $(if $(UNOAPI_ENTITIES), \
 $(if $(UNOAPI_ENTITIES),&& rm -f $${RESPONSEFILE}) \
 $(if $(UNOAPI_REFERENCE), \
$(call gb_Output_announce,$(2),$(true),DBc,3) \
-   && $(gb_UnoApiTarget_UNOIDLCHECKCOMMAND) $(UNOAPI_REFERENCE) -- \
-   $(foreach rdb,$(UNOAPI_DEPRDBS),$(call 
gb_UnoApiTarget_get_target,$(rdb))) \
-   $(1))
+   && { $(gb_UnoApiTarget_UNOIDLCHECKCOMMAND) $(UNOAPI_REFERENCE) -- \
+   $(foreach rdb,$(UNOAPI_DEPRDBS),$(call 
gb_UnoApiTarget_get_target,$(rdb))) \
+   $(1) \
+   || { printf 'ERROR: Published UNO API must not be changed 
incompatibly!\n(If published UNO API shall be changed incompatibly after all, 
see\n.)\n';
 \
+false; } })
 endef
 
 $(call gb_UnoApiTarget_get_target,%) :

[Libreoffice-commits] core.git: solenv/gbuild

[Tor Lillqvist (via logerrit)]

 solenv/gbuild/platform/unxgcc.mk |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 53e2f8906fa067efdbb9ef90aa1ebaac4ab0ed2a
Author: Tor Lillqvist 
AuthorDate: Fri Dec 23 12:41:09 2022 +0200
Commit: Tor Lillqvist 
CommitDate: Fri Dec 23 11:44:14 2022 +

Don't use symlinks for the Emscripten soffice.data and 
soffice.data.js.metadata

Symlinks just complicate things. Disk space is cheap. soffice.data is
under 100 megs even with Qt5.

Note that after this you will need to clean out the existing
soffice.data and soffice.data.js.metadata symlinks before you run
make, otherwise you will get errors.

As such, it is a bit weird that we unconditionally play around with
soffice.data for *all* (non-CppunitTest) Executable targets. (Thus,
for instance also for vcldemo and unoidl-read.) We should do this
dance only for the soffice executable. And we should reduce the number
of executables we build for Emscripten. Probably none other than
soffice itself makes sense?

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

diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index f1cb77a63054..bfb860a41fc2 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -183,8 +183,8 @@ $(if $(filter TRUE,$(ENABLE_QT5)), \
 sed -e 's/@APPNAME@/$(subst $(gb_Executable_EXT),,$(notdir $(1)))/' 
$(QT5_PLATFORMS_SRCDIR)/wasm_shell.html > $(dir $(1))qt_$(notdir $(1)); \
 cp $(QT5_PLATFORMS_SRCDIR)/qtlogo.svg $(QT5_PLATFORMS_SRCDIR)/qtloader.js 
$(dir $(1)) ; \
 ) \
-ln -sf $(call 
gb_CustomTarget_get_workdir,static/emscripten_fs_image)/soffice.data $(dir 
$(1))/soffice.data ; \
-ln -sf $(call 
gb_CustomTarget_get_workdir,static/emscripten_fs_image)/soffice.data.js.metadata
 $(dir $(1))/soffice.data.js.metadata \
+cp $(call 
gb_CustomTarget_get_workdir,static/emscripten_fs_image)/soffice.data $(dir 
$(1))/soffice.data ; \
+cp $(call 
gb_CustomTarget_get_workdir,static/emscripten_fs_image)/soffice.data.js.metadata
 $(dir $(1))/soffice.data.js.metadata \
 )
 endef
 

[Libreoffice-commits] core.git: solenv/gbuild

[Tor Lillqvist (via logerrit)]

 solenv/gbuild/platform/unxgcc.mk |8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

New commits:
commit 1f39fd25469f299e5da54f5eef0d127dd2daf5b6
Author: Tor Lillqvist 
AuthorDate: Fri Dec 23 12:23:32 2022 +0200
Commit: Tor Lillqvist 
CommitDate: Fri Dec 23 11:28:47 2022 +

Un-confuse Emscripten and Qt5 conditionals

The embedded file system that we construct when building for
Emscripten is not related to whether we use Qt5 or not.

Change-Id: Ibf65cae06093d9130a19780c1116f8b9997c664b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144780
Reviewed-by: Tor Lillqvist 
Tested-by: Tor Lillqvist 

diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index 461d1f048390..f1cb77a63054 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -178,11 +178,13 @@ $(if $(filter Library,$(TARGETTYPE)), $(call 
gb_Helper_abbreviate_dirs,\
 | cut -d' ' -f1-2 >> $(WORKDIR)/LinkTarget/$(2).exports.tmp && \
 $(call 
gb_Helper_replace_if_different_and_touch,$(WORKDIR)/LinkTarget/$(2).exports.tmp,
 \
 $(WORKDIR)/LinkTarget/$(2).exports,$(1
-$(if $(and $(filter CppunitTest Executable,$(TARGETTYPE)),$(filter 
EMSCRIPTEN,$(OS)),$(filter TRUE,$(ENABLE_QT5))), \
+$(if $(and $(filter CppunitTest Executable,$(TARGETTYPE)),$(filter 
EMSCRIPTEN,$(OS))), \
+$(if $(filter TRUE,$(ENABLE_QT5)), \
+sed -e 's/@APPNAME@/$(subst $(gb_Executable_EXT),,$(notdir $(1)))/' 
$(QT5_PLATFORMS_SRCDIR)/wasm_shell.html > $(dir $(1))qt_$(notdir $(1)); \
 cp $(QT5_PLATFORMS_SRCDIR)/qtlogo.svg $(QT5_PLATFORMS_SRCDIR)/qtloader.js 
$(dir $(1)) ; \
-sed -e 's/@APPNAME@/$(subst $(gb_Executable_EXT),,$(notdir $(1)))/' 
$(QT5_PLATFORMS_SRCDIR)/wasm_shell.html > $(dir $(1))qt_$(notdir $(1)) ; \
+) \
 ln -sf $(call 
gb_CustomTarget_get_workdir,static/emscripten_fs_image)/soffice.data $(dir 
$(1))/soffice.data ; \
-ln -sf $(call 
gb_CustomTarget_get_workdir,static/emscripten_fs_image)/soffice.data.js.metadata
 $(dir $(1))/soffice.data.js.metadata ; \
+ln -sf $(call 
gb_CustomTarget_get_workdir,static/emscripten_fs_image)/soffice.data.js.metadata
 $(dir $(1))/soffice.data.js.metadata \
 )
 endef
 

[Libreoffice-commits] core.git: solenv/gbuild

[Christian Lohmaier (via logerrit)]

 solenv/gbuild/platform/com_GCC_defs.mk |4 ++--
 solenv/gbuild/platform/unxgcc.mk   |2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 780d55199e54fafc3784691d5cf716c1bb92b0aa
Author: Christian Lohmaier 
AuthorDate: Tue Dec 20 13:44:26 2022 +0100
Commit: Christian Lohmaier 
CommitDate: Thu Dec 22 20:44:07 2022 +

gb_LTOFLAGS: use -flto=jobserver instead of fixed $(PARALLELISM)

fixed PARALLELISM causes explosion of jobs, especially when machines
wtih many cores/threads. A make wtih PARALLELISM=16 would launch up to
16 linker invocations that by themselves would also do their linking
with a parallelism of 16, causing load of over 100 and very likely
exhausting all memory bringing the system to a crawl or cause OOM kills.

for a command to be able to communicate with make's jobserver, it must
be part of a submake called with $(MAKE) or the command from the rule
needs to be prefixed with the + character.
While our gbuild stuff is a submake call, it only is that submake that
uses the PARALLELISM flags determined by configure, so that is not
sufficient for jobserver usage by the the lto linker.

Change-Id: I46ec4760c1a8623195700b8cb16f7deafebe
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144593
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/solenv/gbuild/platform/com_GCC_defs.mk 
b/solenv/gbuild/platform/com_GCC_defs.mk
index 7a2066a60a24..6eeda2fc03ab 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -197,8 +197,8 @@ ifeq (,$(index,iOS MACOSX,$(OS)))
 gb_LTOPLUGINFLAGS := --plugin $(if $(LD_PLUGIN),$(LD_PLUGIN),LLVMgold.so)
 endif
 else
-# use first element of the PARALLELISM, to allow values like "12 -l 14" to 
specify load limits
-gb_LTOFLAGS := -flto=$(if $(filter-out 0,$(PARALLELISM)),$(firstword 
$(PARALLELISM)),auto) -fuse-linker-plugin -O2
+# use parallelism based on make's job handling
+gb_LTOFLAGS := -flto=jobserver -fuse-linker-plugin -O2
 # clang does not support -flto=
 gb_CLANG_LTOFLAGS := -flto=thin
 endif
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index 5e971bd8944c..461d1f048390 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -134,7 +134,7 @@ $(if $(call gb_LinkTarget__WantLock,$2), \
$(gb_LinkTarget__cmd_lockfile) -r -1 $(gb_LinkTarget__Lock) ;  \
echo "$(call gb_Output_announce_str,$(2): got link lock at $$(date 
-u),$(true),LNK,5)" ; \
 )
-   $(if $(filter EMSCRIPTEN,$(OS)),unset PYTHONWARNINGS ;) \
+   +$(if $(filter EMSCRIPTEN,$(OS)),unset PYTHONWARNINGS ;) \
 $(call gb_Helper_abbreviate_dirs,\
$(if $(call gb_LinkTarget__NeedsCxxLinker),$(or $(T_CXX),$(gb_CXX)) 
$(gb_CXX_LINKFLAGS),$(or $(T_CC),$(gb_CC))) \
$(if $(filter Library 
CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \

[Libreoffice-commits] core.git: solenv/gbuild

[Christian Lohmaier (via logerrit)]

 solenv/gbuild/Trace.mk |   10 +++---
 1 file changed, 7 insertions(+), 3 deletions(-)

New commits:
commit 4b67515418ee4f10071b3f0f2275ba37f32b0ae5
Author: Christian Lohmaier 
AuthorDate: Tue Dec 20 12:49:01 2022 +0100
Commit: Christian Lohmaier 
CommitDate: Tue Dec 20 14:11:36 2022 +

gbuild trace: make it work nicer on macOS (seconds-only accuracy)

the finish-gbuild-trace.py matches a nanoseconds timestamp and truncates
it to milliseconds, so could also adjust that and look for the unchanged
%N for mac in the tracefile and handle it that way, but since there is
another conditional needed for the lack of flock on macOS doing it in
the makefile seemd like the more natural choice. (well, not trictly
needed unless you mind the thousands of command not found messages :-))

Change-Id: I768bc9dd8be232567644ae000b6419bb87f58509
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144590
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/solenv/gbuild/Trace.mk b/solenv/gbuild/Trace.mk
index 8d416157d28d..5ff0d0bf4ded 100644
--- a/solenv/gbuild/Trace.mk
+++ b/solenv/gbuild/Trace.mk
@@ -28,11 +28,15 @@ gb_TRACE := $(abspath $(GBUILD_TRACE))
 endif
 
 ifneq ($(gb_TRACE),)
-
-# call gb_Trace_AddMark,marktype,detail,type,extra
+# macOS date doesn't know about nanoseconds switch, and instead of resorting 
to perl or python
+# to create a millisecond timestamp, just avoid the overhead and live with 
seconds-only accuracy
+gb_Trace_Timestamp := $(if $(filter MACOSX,$(OS)),$$(date +%s)0,$(date 
+%s%N))
+# macOS also doesn't provide flock, so skip that part on mac
 # The (flock;cat) part is to minimize lock time.
+gb_Trace_Flock := $(if $(filter MACOSX,$(OS)),,| ( flock 1; cat ))
+# call gb_Trace_AddMark,marktype,detail,type,extra
 define gb_Trace__AddMark
-echo "{\"name\": \"$(3)\", \"ph\": \"$(1)\", \"pid\": 1, \"tid\": 1, \"ts\": 
$$(date +%s%N),\"args\":{\"message\":\"[$(3)]: $(2)\"}}," | ( flock 1; cat ) 
>>$(gb_TRACE)
+echo "{\"name\": \"$(3)\", \"ph\": \"$(1)\", \"pid\": 1, \"tid\": 1, \"ts\": 
$(gb_Trace_Timestamp),\"args\":{\"message\":\"[$(3)]: $(2)\"}}," 
$(gb_Trace_Flock) >>$(gb_TRACE)
 endef
 
 # call gb_Trace_StartRange,detail,type

[Libreoffice-commits] core.git: solenv/gbuild

[Caolán McNamara (via logerrit)]

 solenv/gbuild/partial_build.mk |2 --
 1 file changed, 2 deletions(-)

New commits:
commit bbc5bd1a5fca98e952177e0514c7c17f95ed2083
Author: Caolán McNamara 
AuthorDate: Tue Dec 20 10:28:32 2022 +
Commit: Caolán McNamara 
CommitDate: Tue Dec 20 12:16:23 2022 +

make inclusion of config_host.mk unconditional

to get make vcl.build not to error with

core/solenv/gbuild/LinkTarget.mk:932: *** used LinkTarget 
StaticLibrary/libzlib.a not defined.  Stop.
make: *** [Makefile:121: vcl.build] Error 2

since:

commit b688b779ba20a4bec653808a42fe88cfac851029
Date:   Fri Dec 16 18:41:13 2022 +0100

keep environment clear of SYSTEM_FOO vars

Change-Id: I14c3b09ad8e2ce97066995ed63d67243b8ca4a0f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144586
Reviewed-by: Christian Lohmaier 
Tested-by: Caolán McNamara 

diff --git a/solenv/gbuild/partial_build.mk b/solenv/gbuild/partial_build.mk
index dc52c593f7ee..5819667b2f56 100644
--- a/solenv/gbuild/partial_build.mk
+++ b/solenv/gbuild/partial_build.mk
@@ -28,9 +28,7 @@ BUILDDIR := $(if $(wildcard 
$(gb_partial_build__makefile_dir)../Module_external.
   $(gb_partial_build__makefile_dir)..)
 endif
 
-ifeq ($(BUILD_TYPE),)
 include $(BUILDDIR)/config_$(gb_Side).mk
-endif
 
 gb_PARTIAL_BUILD := T
 include $(SRCDIR)/solenv/gbuild/gbuild.mk

[Libreoffice-commits] core.git: solenv/gbuild

[Andrea Gelmini (via logerrit)]

 solenv/gbuild/Gallery.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2d39c37b61fb2e4d03f5f58a38ba2265064db50b
Author: Andrea Gelmini 
AuthorDate: Tue Dec 13 22:44:50 2022 +0100
Commit: Christian Lohmaier 
CommitDate: Wed Dec 14 13:05:33 2022 +

Fix typo

Change-Id: I1d50f4b47ba32ee6dfd76d3165f15903746de46c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144112
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/solenv/gbuild/Gallery.mk b/solenv/gbuild/Gallery.mk
index 3443a3c1b415..78b9e70ae753 100644
--- a/solenv/gbuild/Gallery.mk
+++ b/solenv/gbuild/Gallery.mk
@@ -136,7 +136,7 @@ $(call gb_Gallery_get_workdir,$(1))/$(1).ulf : \
 
 $(call gb_Gallery_get_workdir,$(1))/$(1).str : $(call 
gb_Gallery_get_workdir,$(1))/$(1).ulf
 
-# oder-only, the Gallery-Target also makes those files
+# order-only, the Gallery-Target also makes those files
 $(addprefix $(call gb_Gallery_get_workdir,$(1))/$(1),.sdg .sdv .thm): | $(call 
gb_Gallery_get_target,$(1))
 $(call gb_Gallery__get_final_target,$(1)) : $(call gb_Package_get_target,$(2))
 

[Libreoffice-commits] core.git: solenv/gbuild

[Christian Lohmaier (via logerrit)]

 solenv/gbuild/Gallery.mk |   17 -
 1 file changed, 4 insertions(+), 13 deletions(-)

New commits:
commit 0cae68768e92b1d735baa2e02602b4f6fe17d13e
Author: Christian Lohmaier 
AuthorDate: Sat Dec 10 17:41:28 2022 +0100
Commit: Christian Lohmaier 
CommitDate: Tue Dec 13 15:10:13 2022 +

don't rebuild Gallery themes if nothing changed

Change-Id: I49fe9d36550a3f712be57fd4e67f0606ee8feea9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143909
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/solenv/gbuild/Gallery.mk b/solenv/gbuild/Gallery.mk
index 42f280e1aad6..3443a3c1b415 100644
--- a/solenv/gbuild/Gallery.mk
+++ b/solenv/gbuild/Gallery.mk
@@ -50,8 +50,8 @@ $(dir $(call gb_Gallery_get_target,$(1))).dir :
 $(dir $(call gb_Gallery_get_target,$(1)))%/.dir :
$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
 
-$(call gb_Gallery_get_target,%) : \
-   $(call gb_Executable_get_runtime_dependencies,gengal)
+$(call gb_Gallery_get_target,%) : $(call gb_Executable_get_target,gengal) \
+| $(call gb_Executable_get_runtime_dependencies,gengal)
$(call gb_Output_announce,$*,$(true),GAL,1)
$(call gb_Trace_StartRange,$*,GAL)
$(call gb_Gallery__command,$@,$*)
@@ -74,14 +74,6 @@ $(call gb_Gallery_get_workdir,%).str : 
$(gb_Gallery_TRANSLATE) \
$(call gb_Gallery__command_str,$@,$*)
$(call gb_Trace_EndRange,$*,STR)
 
-# there must be a rule for these since they are targets due to Package
-$(call gb_Gallery_get_workdir,%).sdg :
-   touch $@
-$(call gb_Gallery_get_workdir,%).sdv :
-   touch $@
-$(call gb_Gallery_get_workdir,%).thm :
-   touch $@
-
 .PHONY : $(call gb_Gallery_get_clean_target,%)
 $(call gb_Gallery_get_clean_target,%) :
$(call gb_Output_announce,$*,$(false),GAL,1)
@@ -144,9 +136,8 @@ $(call gb_Gallery_get_workdir,$(1))/$(1).ulf : \
 
 $(call gb_Gallery_get_workdir,$(1))/$(1).str : $(call 
gb_Gallery_get_workdir,$(1))/$(1).ulf
 
-$(call gb_Gallery_get_workdir,$(1))/$(1).sdg \
-$(call gb_Gallery_get_workdir,$(1))/$(1).sdv \
-$(call gb_Gallery_get_workdir,$(1))/$(1).thm : $(call 
gb_Gallery_get_target,$(1))
+# oder-only, the Gallery-Target also makes those files
+$(addprefix $(call gb_Gallery_get_workdir,$(1))/$(1),.sdg .sdv .thm): | $(call 
gb_Gallery_get_target,$(1))
 $(call gb_Gallery__get_final_target,$(1)) : $(call gb_Package_get_target,$(2))
 
 $(call gb_Gallery_get_clean_target,$(1)) : $(call 
gb_Package_get_clean_target,$(2))

[Libreoffice-commits] core.git: solenv/gbuild

[Stephan Bergmann (via logerrit)]

 solenv/gbuild/platform/linux.mk |4 
 1 file changed, 4 insertions(+)

New commits:
commit baddc742c3fe260d20d7924ab134f0fbf179fd85
Author: Stephan Bergmann 
AuthorDate: Mon Dec 12 11:04:44 2022 +0100
Commit: Stephan Bergmann 
CommitDate: Mon Dec 12 12:28:32 2022 +

lld 16 trunk defaults to --no-undefined-version now

...since


"[ELF] Enable --no-undefined-version by default", causing e.g.

> ld.lld: error: version script assignment of 'PRIVATE_1.4' to symbol 
'_ZN3sal13backtrace_getEm' failed: symbol not defined
> ld.lld: error: version script assignment of 'GLIBCXX_3.4' to symbol 
'_ZNSs4_Rep20_S_empty_rep_storageE' failed: symbol not defined

while building Library_sal and

> ld.lld: error: version script assignment of 'LIBXML2_2.4.30' to symbol 
'xmlXPtrBuildNodeList' failed: symbol not defined
> ld.lld: error: version script assignment of 'LIBXML2_2.4.30' to symbol 
'xmlXPtrEvalRangePredicate' failed: symbol not defined
> ld.lld: error: version script assignment of 'LIBXML2_2.4.30' to symbol 
'xmlXPtrFreeLocationSet' failed: symbol not defined
[...]

while building ExternalProject_libxml2 (and the latter is the reason to add 
to
USE_LD rather than gb_LinkTarget_LDFLAGS, so that this also goes into
gb_ExternalProject_get_link_flags).

This is only relevant for ELF targets, so at least for now add it to 
linux.mk
rather than the general com_GCC_defs.mk.

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

diff --git a/solenv/gbuild/platform/linux.mk b/solenv/gbuild/platform/linux.mk
index 8fc7d38e3f23..127a5f7b372c 100644
--- a/solenv/gbuild/platform/linux.mk
+++ b/solenv/gbuild/platform/linux.mk
@@ -15,6 +15,10 @@ endif
 endif
 gb_LinkTarget_LDFLAGS += $(gb__LinkTarget_LDFLAGS_zdefs)
 
+ifneq ($(findstring lld,$(USE_LD)),)
+USE_LD += -Wl,--undefined-version
+endif
+
 include $(GBUILDDIR)/platform/unxgcc.mk
 
 ifneq ($(ATOMIC_LIB),)

[Libreoffice-commits] core.git: solenv/gbuild

[Christian Lohmaier (via logerrit)]

 solenv/gbuild/LinkTarget.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 59d868b9eddebb19b0c40d7c1ca70265fc9df137
Author: Christian Lohmaier 
AuthorDate: Fri Dec 2 12:32:11 2022 +0100
Commit: Christian Lohmaier 
CommitDate: Mon Dec 5 13:53:31 2022 +

gb_LinkTarget_use_clang: only use flto=thin with clang, not with gcc

The code always used flto=thin, but gcc doesn't know that switch and
fails. The gb_Library_use_clang used by Skia is actually a prefer clang
option, and the corresponding gb_LinkTarget_use_clang macro accounts for
that by using "$(or clangvalue,gccvalue)" to define variables.

This is OK for stuff that defaults to empty value when no clang is found
on the system, but gb_CLANG_LTOFLAGS is defined unconditionally (in
com_GCC_defs.mk), so using the $(or..) function is completly bypassed,
always using the flto=thin switch.

Change-Id: I903e5e4818b8ecbe63ed85952b8741140972e8d7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143572
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 6a0e7580ef22..cc98d18bd4b7 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -2196,7 +2196,7 @@ $(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))
+$(call gb_LinkTarget_get_target,$(1)) : T_LTOFLAGS := $(if 
$(LO_CLANG_CXX),$(gb_CLANG_LTOFLAGS),$(gb_LTOFLAGS))
 endef
 
 # call gb_LinkTarget_use_vclmain,linktarget

[Libreoffice-commits] core.git: solenv/gbuild

[Michael Stahl (via logerrit)]

 solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk |2 ++
 solenv/gbuild/platform/unxgcc.mk   |   10 ++
 solenv/gbuild/static.mk|2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)

New commits:
commit 7a80b68cb0b279a1b43f769169aaf2a2659dc150
Author: Michael Stahl 
AuthorDate: Mon Nov 14 20:16:41 2022 +0100
Commit: Michael Stahl 
CommitDate: Mon Nov 28 16:23:06 2022 +0100

WASM gbuild: write link dependencies into a file $@.linkdeps

The static build was added in commit
dc9ccf3d8f294cd7ae9d5bece7b6c16c3b22f6a5 and commit
b04be559ddf4a7f0a5cdc0b9abc2bcfc4aae25cc and there are several files
written to workdir/LinkTarget/*/*.d.{libraries,externals,statics}
that list all the (recursive) dependencies of a LinkTarget.

Unfortunately the content of these files requires gbuild to interpret,
because it's using the Library names which may not map 1:1 to file
names, not to mention "externals"; this is all resolved by calls to
gb_LinkTarget_use_* anyway.

To get a command line that's usable outside of gbuild, write another
file $@.linkdeps as a side effect of gb_LinkTarget__command_dynamiclink.

Change-Id: I94f31142413561dcdb56fa722a4517f84fcd7d61
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143393
Reviewed-by: Michael Stahl 
Tested-by: Jenkins

diff --git a/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk 
b/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk
index 61424f72c44f..35a136b2f38d 100644
--- a/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk
@@ -64,6 +64,7 @@ gb_COMPILERNOOPTFLAGS := -O1 -fstrict-aliasing 
-fstrict-overflow
 # cleanup addition JS and wasm files for binaries
 define gb_Executable_Executable_platform
 $(call gb_LinkTarget_add_auxtargets,$(2),\
+$(patsubst %.lib,%.linkdeps,$(3)) \
 $(patsubst %.lib,%.wasm,$(3)) \
 $(patsubst %.lib,%.js,$(3)) \
 $(patsubst %.lib,%.worker.js,$(3)) \
@@ -75,6 +76,7 @@ endef
 
 define gb_CppunitTest_CppunitTest_platform
 $(call gb_LinkTarget_add_auxtargets,$(2),\
+$(patsubst %.lib,%.linkdeps,$(3)) \
 $(patsubst %.lib,%.wasm,$(3)) \
 $(patsubst %.lib,%.js,$(3)) \
 $(patsubst %.lib,%.worker.js,$(3)) \
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index cc377a5b4309..5e971bd8944c 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -152,10 +152,12 @@ $(call gb_Helper_abbreviate_dirs,\
$(foreach extraobjectlist,$(EXTRAOBJECTLISTS),`cat 
$(extraobjectlist)`) \
$(if $(filter TRUE,$(DISABLE_DYNLOADING)), \
-Wl$(COMMA)--start-group \
-   $(patsubst lib%.a,-l%,$(patsubst lib%.so,-l%,$(patsubst 
%.$(gb_Library_UDK_MAJORVER),%,$(foreach lib,$(LINKED_LIBS),$(call 
gb_Library_get_filename,$(lib)) \
-   $(foreach lib,$(LINKED_STATIC_LIBS),$(call 
gb_StaticLibrary_get_target,$(lib))) \
-   $(patsubst $(gb_LinkTarget__syslib),%,$(T_LIBS)) \
-   $(if $(call 
gb_LinkTarget__NeedsCxxLinker),$(T_STDLIBS_CXX)) \
+   $(shell echo -n \
+   $(patsubst lib%.a,-l%,$(patsubst 
lib%.so,-l%,$(patsubst %.$(gb_Library_UDK_MAJORVER),%,$(foreach 
lib,$(LINKED_LIBS),$(call gb_Library_get_filename,$(lib)) \
+   $(foreach lib,$(LINKED_STATIC_LIBS),$(call 
gb_StaticLibrary_get_target,$(lib))) \
+   $(patsubst 
$(gb_LinkTarget__syslib),%,$(T_LIBS)) \
+   $(if $(call 
gb_LinkTarget__NeedsCxxLinker),$(T_STDLIBS_CXX)) \
+   | tee $@.linkdeps) \
-Wl$(COMMA)--end-group \
, \
-Wl$(COMMA)--start-group \
diff --git a/solenv/gbuild/static.mk b/solenv/gbuild/static.mk
index faa9a73db516..9b98ec99c593 100644
--- a/solenv/gbuild/static.mk
+++ b/solenv/gbuild/static.mk
@@ -51,7 +51,7 @@
 # doesn't seem to happen in any breaking way and it works to link multiple 
Executable
 # with large and small expanded dependency lists.
 #
-# Then there is the special static "components" library, which simply depends 
on all build
+# Then there is the special static "components" library, which simply depends 
on all built
 # components. In theory these could be limited per-module (Writer, Calc, 
etc.), but currently
 # this is not implemented and instead solenv/bin/native-code.py is used, so 
actually
 # everything is build and "cleaned up" at link time, which is especially 
expensive for WASM.

[Libreoffice-commits] core.git: solenv/gbuild

[Michael Stahl (via logerrit)]

 solenv/gbuild/platform/com_GCC_defs.mk |3 ++-
 solenv/gbuild/platform/unxgcc.mk   |2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 988d719cfbe097f674abfd04fdc4f9c2874b21b3
Author: Michael Stahl 
AuthorDate: Tue Nov 8 15:18:40 2022 +0100
Commit: Michael Stahl 
CommitDate: Mon Nov 28 15:33:19 2022 +0100

WASM gbuild: avoid annoying python warnings from emscripten

/home/builder/emsdk/upstream/emscripten/tools/building.py:1228: 
ResourceWarning: unclosed file <_io.BufferedReader 
name='/data/lo/build_feature_wasm/workdir/LinkTarget/StaticLibrary/libdtoa.a'>
  header = open(filename, 'rb').read(8)
ResourceWarning: Enable tracemalloc to get the object allocation traceback

Change-Id: I5cd052cd47af92e18cb6ccce31d4503a322d815b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143389
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/solenv/gbuild/platform/com_GCC_defs.mk 
b/solenv/gbuild/platform/com_GCC_defs.mk
index 87231a57196f..7a2066a60a24 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -277,7 +277,8 @@ ifeq ($(COMPILER_PLUGINS_DEBUG),TRUE)
 gb_COMPILER_PLUGINS += -Xclang -plugin-arg-loplugin -Xclang --debug
 endif
 # set CCACHE_CPP2=1 to prevent clang generating spurious warnings
-gb_COMPILER_SETUP += CCACHE_CPP2=1
+# clear PYTHONWARNINGS to prevent noise from emscripten implementation
+gb_COMPILER_SETUP += CCACHE_CPP2=1 $(if $(filter 
EMSCRIPTEN,$(OS)),PYTHONWARNINGS=default)
 gb_COMPILER_PLUGINS_SETUP := 
ICECC_EXTRAFILES=$(SRCDIR)/include/sal/log-areas.dox 
CCACHE_EXTRAFILES=$(SRCDIR)/include/sal/log-areas.dox 
SCCACHE_EXTRAFILES=$(SRCDIR)/include/sal/log-areas.dox
 gb_COMPILER_PLUGINS_WARNINGS_AS_ERRORS := \
 -Xclang -plugin-arg-loplugin -Xclang --warnings-as-errors
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index b3388eec436a..cc377a5b4309 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -134,6 +134,7 @@ $(if $(call gb_LinkTarget__WantLock,$2), \
$(gb_LinkTarget__cmd_lockfile) -r -1 $(gb_LinkTarget__Lock) ;  \
echo "$(call gb_Output_announce_str,$(2): got link lock at $$(date 
-u),$(true),LNK,5)" ; \
 )
+   $(if $(filter EMSCRIPTEN,$(OS)),unset PYTHONWARNINGS ;) \
 $(call gb_Helper_abbreviate_dirs,\
$(if $(call gb_LinkTarget__NeedsCxxLinker),$(or $(T_CXX),$(gb_CXX)) 
$(gb_CXX_LINKFLAGS),$(or $(T_CC),$(gb_CC))) \
$(if $(filter Library 
CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \
@@ -186,6 +187,7 @@ endef
 define gb_LinkTarget__command_staticlink
 $(call gb_Helper_abbreviate_dirs,\
rm -f $(1) && \
+   $(if $(filter EMSCRIPTEN,$(OS)),unset PYTHONWARNINGS ;) \
$(gb_AR) $(gb_LTOPLUGINFLAGS) -rsu $(1) \
$(foreach object,$(COBJECTS),$(call 
gb_CObject_get_target,$(object))) \
$(foreach object,$(CXXOBJECTS),$(call 
gb_CxxObject_get_target,$(object))) \

[Libreoffice-commits] core.git: solenv/gbuild

[Stephan Bergmann (via logerrit)]

 solenv/gbuild/Module.mk |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 4dc372c87b194c32597eda6a7f99ddcee3108fa6
Author: Stephan Bergmann 
AuthorDate: Thu Nov 24 10:22:58 2022 +0100
Commit: Stephan Bergmann 
CommitDate: Thu Nov 24 11:35:38 2022 +0100

Expansion of $(dir ...) always ends in a slash, no need for an additional 
one

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

diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk
index fe7470e85822..f3224179fbe8 100644
--- a/solenv/gbuild/Module.mk
+++ b/solenv/gbuild/Module.mk
@@ -246,9 +246,9 @@ $(WORKDIR)/pot.done : $(foreach exec,cfgex helpex localize 
propex ulfex xrmex tr
$(call gb_Output_announce,$(subst .pot,,$(subst 
$(WORKDIR)/,,$@)),$(true),POT,1)
$(call gb_Trace_MakeMark,$(subst .pot,,$(subst $(WORKDIR)/,,$@)),POT)
$(call gb_Helper_abbreviate_dirs,\
-   mkdir -p $(dir $@) && $(call gb_Helper_execute,localize) 
$(SRCDIR) $(dir $@)/pot \
+   mkdir -p $(dir $@) && $(call gb_Helper_execute,localize) 
$(SRCDIR) $(dir $@)pot \

$(gb_Helper_LIBRARY_PATH_VAR)"$${$(gb_Helper_LIBRARY_PATH_VAR)+=$$$(gb_Helper_LIBRARY_PATH_VAR)}"
 \
-   && $(FIND) $(dir $@)/pot -type f -printf "%P\n" | sed -e 
"s/\.pot/.po/" | LC_ALL=C $(SORT) > $(dir $@)/LIST \
+   && $(FIND) $(dir $@)pot -type f -printf "%P\n" | sed -e 
"s/\.pot/.po/" | LC_ALL=C $(SORT) > $(dir $@)LIST \
&& touch $@)
 
 # enable if: no "-MODULE/" defined AND ["all" defined OR "MODULE/" defined]

[Libreoffice-commits] core.git: solenv/gbuild sw/CppunitTest_sw_core_layout.mk sw/layoutwriter_setup.mk vcl/CppunitTest_vcl_cjk.mk vcl/CppunitTest_vcl_pdfexport.mk vcl/unx

[Stephan Bergmann (via logerrit)]

 solenv/gbuild/CppunitTest.mk   |   12 +++-
 sw/CppunitTest_sw_core_layout.mk   |4 +---
 sw/layoutwriter_setup.mk   |4 +---
 vcl/CppunitTest_vcl_cjk.mk |4 +---
 vcl/CppunitTest_vcl_pdfexport.mk   |4 +---
 vcl/unx/generic/fontmanager/fontconfig.cxx |3 +--
 6 files changed, 16 insertions(+), 15 deletions(-)

New commits:
commit 5aa8e7ef07229d48cb719a5f3f01c9a7fa445554
Author: Stephan Bergmann 
AuthorDate: Fri Sep 2 08:15:01 2022 +0200
Commit: Stephan Bergmann 
CommitDate: Fri Sep 2 12:12:29 2022 +0200

Fix setting SAL_NON_APPLICATION_FONT_USE

...after a342b72f4218cd617aa6fb413fcf5fbb182c316f "gbuild: set
SAL_NON_APPLICATION_FONT_USE in gb_CppunitTest_use_more_fonts" had caused 
e.g.
CppunitTest_vcl_pdfexport to be executed with merely
SAL_NON_APPLICATION_FONT_USE=deny rather than the stronger
SAL_NON_APPLICATION_FONT_USE=abort that vcl/CppunitTest_vcl_pdfexport.mk 
asked
for.

So introduce a dedicated gb_CppunitTest_set_non_application_font_use that
accumulates the requested modes and then selects the strongest requested one
("allow" over "abort" over "deny").  That also means we can go back to model
"allow" with an unset SAL_NON_APPLICATION_FONT_USE env var.

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

diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index fbfc3f30aacb..b16e3d0e5417 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -132,6 +132,9 @@ else
$(if $(gb_CppunitTest__vcl_no_svp), \
$(filter-out 
SAL_USE_VCLPLUGIN=svp,$(gb_TEST_ENV_VARS)),$(gb_TEST_ENV_VARS)) \
$(EXTRA_ENV_VARS) \
+   $(if $(filter allow,$(NON_APPLICATION_FONT_USE)),, \
+   $(if $(filter 
abort,$(NON_APPLICATION_FONT_USE)),SAL_NON_APPLICATION_FONT_USE=abort, \
+   $(if $(filter 
deny,$(NON_APPLICATION_FONT_USE)),SAL_NON_APPLICATION_FONT_USE=deny))) \
$(if $(filter 
gdb,$(gb_CppunitTest_GDBTRACE)),,$(gb_CppunitTest_CPPTESTPRECOMMAND)) \
$(if $(G_SLICE),G_SLICE=$(G_SLICE)) \
$(if 
$(GLIBCXX_FORCE_NEW),GLIBCXX_FORCE_NEW=$(GLIBCXX_FORCE_NEW)) \
@@ -198,6 +201,7 @@ $(call gb_CppunitTest_get_target,$(1)) : UNO_SERVICES :=
 $(call gb_CppunitTest_get_target,$(1)) : UNO_TYPES :=
 $(call gb_CppunitTest_get_target,$(1)) : HEADLESS := --headless
 $(call gb_CppunitTest_get_target,$(1)) : EXTRA_ENV_VARS :=
+$(call gb_CppunitTest_get_target,$(1)) : NON_APPLICATION_FONT_USE :=
 $$(eval $$(call gb_Module_register_target,$(call 
gb_CppunitTest_get_target,$(1)),$(call gb_CppunitTest_get_clean_target,$(1
 $(call gb_Helper_make_userfriendly_targets,$(1),CppunitTest)
 
@@ -383,11 +387,17 @@ $(call gb_CppunitTest_get_target,$(1)) : $(call 
gb_Executable_get_target,$(2))
 
 endef
 
+# One of allow, deny, abort:
+define gb_CppunitTest_set_non_application_font_use
+$(call gb_CppunitTest_get_target,$(1)) : NON_APPLICATION_FONT_USE += $(2)
+
+endef
+
 define gb_CppunitTest_use_more_fonts
 ifneq ($(filter MORE_FONTS,$(BUILD_TYPE)),)
 $(call gb_CppunitTest_get_target,$(1)) : \
 $(foreach font,$(gb_Package_MODULE_ooo_fonts),$(call 
gb_Package_get_target,$(font)))
-$(call gb_CppunitTest_get_target,$(1)) : EXTRA_ENV_VARS := 
SAL_NON_APPLICATION_FONT_USE=deny
+$(call gb_CppunitTest_set_non_application_font_use,$(1),deny)
 endif
 
 endef
diff --git a/sw/CppunitTest_sw_core_layout.mk b/sw/CppunitTest_sw_core_layout.mk
index 8d8458ea8c4e..9392d81adc59 100644
--- a/sw/CppunitTest_sw_core_layout.mk
+++ b/sw/CppunitTest_sw_core_layout.mk
@@ -72,9 +72,7 @@ $(eval $(call gb_CppunitTest_use_uiconfigs,sw_core_layout, \
 ))
 
 # assert if font/glyph fallback occurs
-$(call gb_CppunitTest_get_target,sw_core_layout): \
-EXTRA_ENV_VARS := \
-SAL_NON_APPLICATION_FONT_USE=abort
+$(eval $(call 
gb_CppunitTest_set_non_application_font_use,sw_core_layout,abort))
 
 $(eval $(call gb_CppunitTest_use_more_fonts,sw_core_layout))
 
diff --git a/sw/layoutwriter_setup.mk b/sw/layoutwriter_setup.mk
index 683ca04f4a9f..bcbcee62083b 100644
--- a/sw/layoutwriter_setup.mk
+++ b/sw/layoutwriter_setup.mk
@@ -83,9 +83,7 @@ $(call gb_CppunitTest_get_target,sw_layoutwriter$(1)): \
 $(call gb_Library_get_target,textconv_dict)
 
 # assert if font/glyph fallback occurs
-$(call gb_CppunitTest_get_target,sw_layoutwriter$(1)): \
-EXTRA_ENV_VARS := \
-SAL_NON_APPLICATION_FONT_USE=abort
+$(eval $(call 
gb_CppunitTest_set_non_application_font_use,sw_layoutwriter$(1),abort))
 
 $(eval $(call gb_CppunitTest_use_more_fonts,sw_layoutwriter$(1)))
 
diff --git a/vcl/CppunitTest_vcl_cjk.mk b/vcl/CppunitTest_vcl_cjk.mk
index 8da3e5da4019..ea2d70a35cd6 100644
--- a/vcl/CppunitTest_vcl_cjk.mk

[Libreoffice-commits] core.git: solenv/gbuild vcl/CppunitTest_vcl_text.mk

[Khaled Hosny (via logerrit)]

 solenv/gbuild/CppunitTest.mk |1 +
 vcl/CppunitTest_vcl_text.mk  |5 -
 2 files changed, 1 insertion(+), 5 deletions(-)

New commits:
commit a342b72f4218cd617aa6fb413fcf5fbb182c316f
Author: Khaled Hosny 
AuthorDate: Thu Sep 1 09:25:52 2022 +0200
Commit: Caolán McNamara 
CommitDate: Thu Sep 1 11:52:36 2022 +0200

gbuild: set SAL_NON_APPLICATION_FONT_USE in gb_CppunitTest_use_more_fonts

So it applies to all tests using HAVE_MORE_FONTS.

Change-Id: I60567c996286aa8a76c7180c58aea7f214a99d87
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139144
Tested-by: Jenkins
Tested-by: Caolán McNamara 
Reviewed-by: Caolán McNamara 

diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index 821d1d6f2c74..fbfc3f30aacb 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -387,6 +387,7 @@ define gb_CppunitTest_use_more_fonts
 ifneq ($(filter MORE_FONTS,$(BUILD_TYPE)),)
 $(call gb_CppunitTest_get_target,$(1)) : \
 $(foreach font,$(gb_Package_MODULE_ooo_fonts),$(call 
gb_Package_get_target,$(font)))
+$(call gb_CppunitTest_get_target,$(1)) : EXTRA_ENV_VARS := 
SAL_NON_APPLICATION_FONT_USE=deny
 endif
 
 endef
diff --git a/vcl/CppunitTest_vcl_text.mk b/vcl/CppunitTest_vcl_text.mk
index cf091ba88c25..4ffa3b1990ca 100644
--- a/vcl/CppunitTest_vcl_text.mk
+++ b/vcl/CppunitTest_vcl_text.mk
@@ -61,11 +61,6 @@ $(eval $(call gb_CppunitTest_use_components,vcl_text,\
 
 $(eval $(call gb_CppunitTest_use_configuration,vcl_text))
 
-# only allow bundled fonts, but don't abort if font/glyph fallback occurs
-$(call gb_CppunitTest_get_target,vcl_text): \
-EXTRA_ENV_VARS := \
-SAL_NON_APPLICATION_FONT_USE=deny
-
 $(eval $(call gb_CppunitTest_use_more_fonts,vcl_text))
 
 # vim: set noet sw=4 ts=4:

[Libreoffice-commits] core.git: solenv/gbuild

[Noel Grandin (via logerrit)]

 solenv/gbuild/platform/com_GCC_defs.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit a95bf932ed22abbb346b1d70e3c32578074667f3
Author: Noel Grandin 
AuthorDate: Sat Aug 6 12:47:22 2022 +0200
Commit: Noel Grandin 
CommitDate: Sat Aug 6 15:05:16 2022 +0200

turn on -Wshadow-all for clang compilers

mostly so that it matches the existing behaviour of the GCC compiler,
which makes it easier submitting patches when building locally with
clang

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

diff --git a/solenv/gbuild/platform/com_GCC_defs.mk 
b/solenv/gbuild/platform/com_GCC_defs.mk
index 004945a32d32..443ff10eaae1 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -70,6 +70,7 @@ gb_CFLAGS_COMMON := \
-Wunreachable-code \
$(if $(or $(and $(COM_IS_CLANG),$(or $(findstring 
icecc,$(CC)),$(findstring icecc,$(CCACHE_PREFIX,$(findstring 
sccache,$(CC))),,-Wunused-macros) \
$(if $(COM_IS_CLANG),-Wembedded-directive) \
+   $(if $(COM_IS_CLANG),-Wshadow-all) \
-finput-charset=UTF-8 \
-fmessage-length=0 \
-fno-common \

[Libreoffice-commits] core.git: solenv/gbuild

[Hannah Meeks (via logerrit)]

 solenv/gbuild/CppunitTest.mk |2 +-
 solenv/gbuild/PythonTest.mk  |2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 5eb4c5e93b0f0a3fd9cded5e086086d07cb7c92d
Author: Hannah Meeks 
AuthorDate: Mon Jul 18 16:42:37 2022 +0100
Commit: Stephan Bergmann 
CommitDate: Mon Jul 18 20:22:03 2022 +0200

Mend python support for lldb cppunit tests.

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

diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index cae6e2a2f9be..821d1d6f2c74 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -137,7 +137,7 @@ else
$(if 
$(GLIBCXX_FORCE_NEW),GLIBCXX_FORCE_NEW=$(GLIBCXX_FORCE_NEW)) \
$(if $(strip $(PYTHON_URE)),\
PYTHONDONTWRITEBYTECODE=1) \
-   $(if $(strip $(CPPUNITTRACE)),\
+   $(if $(filter gdb,$(CPPUNITTRACE)),\
PYTHONWARNINGS=default) \
$(ICECREAM_RUN) $(gb_CppunitTest_GDBTRACE) 
$(gb_CppunitTest_VALGRINDTOOL) $(gb_CppunitTest_RR) \
$(gb_CppunitTest_CPPTESTCOMMAND) \
diff --git a/solenv/gbuild/PythonTest.mk b/solenv/gbuild/PythonTest.mk
index 4e81261d2354..09f039771895 100644
--- a/solenv/gbuild/PythonTest.mk
+++ b/solenv/gbuild/PythonTest.mk
@@ -60,6 +60,8 @@ else
TestUserDir="$(call gb_Helper_make_url,$(dir $(call 
gb_PythonTest_get_target,$*)))" \
PYTHONDONTWRITEBYTECODE=1 \
$(gb_TEST_ENV_VARS) \
+   $(if $(filter gdb,$(CPPUNITTRACE)),\
+   PYTHONWARNINGS=default) \
$(ICECREAM_RUN) $(gb_PythonTest_GDBTRACE) 
$(gb_CppunitTest_VALGRINDTOOL) $(gb_CppunitTest_RR) \
$(gb_PythonTest_COMMAND) \
$(if 
$(PYTHON_TEST_NAME),$(PYTHON_TEST_NAME),$(MODULES)) \

[Libreoffice-commits] core.git: solenv/gbuild

[Hannah Meeks (via logerrit)]

 solenv/gbuild/CppunitTest.mk |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 7a4814f717520b8de8c963dc2d576f05fc15d2e9
Author: Hannah Meeks 
AuthorDate: Wed Jul 13 14:45:37 2022 +0100
Commit: Tomaž Vajngerl 
CommitDate: Thu Jul 14 10:20:35 2022 +0200

Change make file so that debugging works - Previous error:

hannah@localhost:~/master/sw>  make CppunitTest_sw_macros_test 
CPPUNITTRACE="gdb --args"
[CUT] sw_macros_test
S=/data/opt/libreoffice/master && I=$S/instdir && W=$S/workdir &&  mkdir -p 
$W/CppunitTest/ && rm -fr $W/CppunitTest/sw_macros_test.test.user && cp -r 
$W/unittest $W/CppunitTest/sw_macros_test.test.user &&   (  MAX_CONCURRENCY=4 
MOZILLA_CERTIFICATE_FOLDER=dbm: SAL_DISABLE_SYNCHRONOUS_PRINTER_DETECTION=1 
SAL_USE_VCLPLUGIN=svp LIBO_LANG=C  icerun   PYTHONWARNINGS=default gdb 
-return-child-result -ex "add-auto-load-safe-path $S/instdir" -ex "set 
environment LD_LIBRARY_PATH 
${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}"$I/program:$I/program":$W/UnpackedTarball/cppunit/src/cppunit/.libs"
  -ex 'set environment MALLOC_CHECK_=2; set environment MALLOC_PERTURB_=153'  
--args   $W/LinkTarget/Executable/cppunittester 
$W/LinkTarget/CppunitTest/libtest_sw_macros_test.so --headless 
"-env:BRAND_BASE_DIR=file://$S/instdir" "-env:BRAND_SHARE_SUBDIR=share" 
"-env:BRAND_SHARE_RESOURCE_SUBDIR=program/resource" 
"-env:UserInstallation=file://$W/CppunitTest/sw_macros_test.test.user"   
"-env:CONFIGURATION_LAY
 ERS=xcsxcu:file://$I/share/registry xcsxcu:file://$W/unittest/registry"  
"-env:UNO_TYPES=file://$I/program/types/offapi.rdb 
file://$I/program/types/oovbaapi.rdb file://$I/program/types.rdb"  
"-env:UNO_SERVICES=file://$W/Rdb/ure/services.rdb file://$W/Rdb/services.rdb" 
-env:URE_BIN_DIR=file://$I/program -env:URE_INTERNAL_LIB_DIR=file://$I/program 
-env:LO_LIB_DIR=file://$I/program -env:LO_JAVA_DIR=file://$I/program/classes 
--protector $W/LinkTarget/Library/unoexceptionprotector.so 
unoexceptionprotector --protector 
$W/LinkTarget/Library/unobootstrapprotector.so unobootstrapprotector   
--protector $W/LinkTarget/Library/libvclbootstrapprotector.so 
vclbootstrapprotector   
"-env:CPPUNITTESTTARGET=$W/CppunitTest/sw_macros_test.test"  )
ICECC[448] 2022-07-13 13:23:02: couldn't find any PYTHONWARNINGS=default
ICECC[448] 2022-07-13 13:23:02: could not find PYTHONWARNINGS=default in 
PATH.
make: *** [/data/opt/libreoffice/master/solenv/gbuild/CppunitTest.mk:121: 
/data/opt/libreoffice/master/workdir/CppunitTest/sw_macros_test.test] Error 115
hannah@localhost:~/master/sw>

Change-Id: Idebbd385f70edd9b691d91f6eded8ee02ac9cce7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137032
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 

diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index 7900c8f05ac5..cae6e2a2f9be 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -26,10 +26,10 @@ ifneq ($(strip $(CPPUNITTRACE)),)
 ifneq ($(filter gdb,$(CPPUNITTRACE)),)
 # sneak (a) setting the LD_LIBRARY_PATH, and (b) setting malloc debug flags, 
into the "gdb --args" command line
 gb_CppunitTest_GDBTRACE := $(subst gdb,\
-   PYTHONWARNINGS=default gdb -return-child-result -ex 
"add-auto-load-safe-path $(INSTDIR)" -ex "set environment $(subst =, 
,$(gb_CppunitTest_CPPTESTPRECOMMAND))" $(if $(PYTHONWARNINGS),-ex 'set 
environment PYTHONWARNINGS $(PYTHONWARNINGS)') $(gb_CppunitTest_malloc_check) 
$(gb_CppunitTest_DEBUGCPPUNIT),\
+   gdb -return-child-result -ex "add-auto-load-safe-path $(INSTDIR)" -ex 
"set environment $(subst =, ,$(gb_CppunitTest_CPPTESTPRECOMMAND))" $(if 
$(PYTHONWARNINGS),-ex 'set environment PYTHONWARNINGS $(PYTHONWARNINGS)') 
$(gb_CppunitTest_malloc_check) $(gb_CppunitTest_DEBUGCPPUNIT),\
$(CPPUNITTRACE))
 gb_PythonTest_GDBTRACE := $(subst gdb,\
-   PYTHONWARNINGS=default gdb -return-child-result -ex 
"add-auto-load-safe-path $(INSTDIR)" -ex "set environment $(subst =, 
,$(gb_PythonTest_PRECOMMAND))" $(if $(PYTHONWARNINGS),-ex 'set environment 
PYTHONWARNINGS $(PYTHONWARNINGS)') $(gb_CppunitTest_malloc_check) 
$(gb_CppunitTest_DEBUGCPPUNIT),\
+   gdb -return-child-result -ex "add-auto-load-safe-path $(INSTDIR)" -ex 
"set environment $(subst =, ,$(gb_PythonTest_PRECOMMAND))" $(if 
$(PYTHONWARNINGS),-ex 'set environment PYTHONWARNINGS $(PYTHONWARNINGS)') 
$(gb_CppunitTest_malloc_check) $(gb_CppunitTest_DEBUGCPPUNIT),\
$(CPPUNITTRACE))
 else ifneq ($(filter lldb,$(CPPUNITTRACE)),)
 gb_CppunitTest_GDBTRACE := $(subst lldb,\
@@ -137,6 +137,8 @@ else
$(if 
$(GLIBCXX_FORCE_NEW),GLIBCXX_FORCE_NEW=$(GLIBCXX_FORCE_NEW)) \
$(if $(strip $(PYTHON_URE)),\
PYTHONDONTWRITEBYTECODE=1) \
+   $(if $(strip $(CPPUNITTRACE)),\
+   PYTHONWARNINGS=default) \
$(ICECREAM_RUN) $(gb_CppunitTest_GDBTRACE) 
$(gb_CppunitTest_VALGRINDTOOL) 

[Libreoffice-commits] core.git: solenv/gbuild

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

 solenv/gbuild/platform/com_GCC_defs.mk |2 --
 1 file changed, 2 deletions(-)

New commits:
commit e3f8a433799b2ccc2f16ba7691f790bd98febb16
Author: Luboš Luňák 
AuthorDate: Tue Jun 7 12:04:27 2022 +0200
Commit: Luboš Luňák 
CommitDate: Wed Jun 8 14:13:54 2022 +0200

it is not our job to tell GCC whether to colorize its output

GCC's -fdiagnostics-color option is complex (read: brain-damaged),
since it depends on how the compiler was configured during building it

(https://gcc.gnu.org/onlinedocs/gcc/Diagnostic-Message-Formatting-Options.html).
So while with Clang coloring works out of the box and the option
can be used for force it in special cases, GCC depending on how
it's been built may (or may not) require the option explicitly
just to do the sane default. 13b52f50e52d226c935dcb94fac641c59a77f13f
added an explicitly =auto to handle that, and then
9ab2703d5c212746c961dcb238a4c3025d3a2587 changed it to =always
depending on gb_COLOR to prevent it from overriding
explicitly used option. This results in a possible massive rebuild
when redirecting build output (because e.g. PCHs get rebuilt if
build flags change, and ccache I think cannot use cached compilations
either).

It should not be gbuild's job to go out of its way to handle broken
tooling, so just revert both of those. If somebody uses such a lame
GCC build, either don't do that, add those explicit flags
to CXX/ENVCFLAGSCXX, or create a clean way to add flags to CXXFLAGS
or something.

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

diff --git a/solenv/gbuild/platform/com_GCC_defs.mk 
b/solenv/gbuild/platform/com_GCC_defs.mk
index f16eb8ec282c..004945a32d32 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -75,7 +75,6 @@ gb_CFLAGS_COMMON := \
-fno-common \
-pipe \
$(if $(filter 
EMSCRIPTEN,$(OS)),-fno-stack-protector,-fstack-protector-strong) \
-   $(if $(gb_COLOR),-fdiagnostics-color=always) \
 
 gb_CXXFLAGS_COMMON := \
-Wall \
@@ -93,7 +92,6 @@ gb_CXXFLAGS_COMMON := \
-fno-common \
-pipe \
$(if $(filter 
EMSCRIPTEN,$(OS)),-fno-stack-protector,-fstack-protector-strong) \
-   $(if $(gb_COLOR),-fdiagnostics-color=always) \
 
 ifeq ($(HAVE_WDEPRECATED_COPY_DTOR),TRUE)
 gb_CXXFLAGS_COMMON += -Wdeprecated-copy-dtor

[Libreoffice-commits] core.git: solenv/gbuild

[Stephan Bergmann (via logerrit)]

 solenv/gbuild/ExternalProject.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2ec4aa9f24d618bae5be84b804bf4a51faea4e32
Author: Stephan Bergmann 
AuthorDate: Tue May 3 08:55:41 2022 +0200
Commit: Stephan Bergmann 
CommitDate: Tue May 3 13:36:09 2022 +0200

Keep passing LDFLAGS into external proejct builds

...which had been broken with 1ffd6897ddf15624e70585ab08e8af713114c938 "try 
to
use also proper debug LDFLAGS for externals libraries", and e.g. one of my 
macOS
builds uses a non-standard Clang compiler and libc++ library, and thus needs

  LDFLAGS=-L/Users/stephan/llvm/inst/lib

in autogen.input

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

diff --git a/solenv/gbuild/ExternalProject.mk b/solenv/gbuild/ExternalProject.mk
index 68910712ff6d..5227e6c13bec 100644
--- a/solenv/gbuild/ExternalProject.mk
+++ b/solenv/gbuild/ExternalProject.mk
@@ -212,7 +212,7 @@ gb_ExternalProject_get_build_flags = $(call 
gb_LinkTarget__get_debugflags,Extern
 
 # Returns flags to include in LDFLAGS to enable optimizations and/or debugging.
 # gb_ExternalProject_get_link_flags project
-gb_ExternalProject_get_link_flags = $(USE_LD) $(call 
gb_LinkTarget__get_debugldflags,ExternalProject_$(1))
+gb_ExternalProject_get_link_flags = $(LDFLAGS) $(USE_LD) $(call 
gb_LinkTarget__get_debugldflags,ExternalProject_$(1))
 
 # Run a target command
 #

[Libreoffice-commits] core.git: solenv/gbuild solenv/Module_solenv.mk

[Michael Weghorn (via logerrit)]

 solenv/Module_solenv.mk   |2 --
 solenv/gbuild/extensions/post_GbuildToJson.mk |4 
 2 files changed, 6 deletions(-)

New commits:
commit 779c01a9e1eb3ed176d57e1e04073e25aca34a64
Author: Michael Weghorn 
AuthorDate: Fri Apr 29 10:56:55 2022 +0200
Commit: Michael Weghorn 
CommitDate: Fri Apr 29 13:07:28 2022 +0200

gbuild: Drop obsolete checks for make version 3.81

make 3.81 is no more suppoprted, see

commit 4688e74bcf0c58ab1bbf60e9c19331d25ebfe95b
Date:   Fri Apr 8 11:22:27 2022 +0200

configure: require GNU make 3.82

Change-Id: I0f820512df96fa1712374d3308d15591799222fa
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133592
Tested-by: Jenkins
Reviewed-by: Michael Weghorn 

diff --git a/solenv/Module_solenv.mk b/solenv/Module_solenv.mk
index 6b9f7d0f1a8c..89e40c6d43c0 100644
--- a/solenv/Module_solenv.mk
+++ b/solenv/Module_solenv.mk
@@ -29,7 +29,6 @@ $(eval $(call gb_Module_add_targets,solenv,\
 endif
 
 ifneq ($(DISABLE_PYTHON),TRUE)
-ifneq ($(MAKE_VERSION),3.81) # gbuildtojson requires 3.82+
 ifneq ($(OS),WNT) # disable on Windows for now, causes gerrit/jenkins failures
 ifneq ($(OS),MACOSX) # disable on macOS too, fails at least for me and would 
be pointless anyway surely
 $(eval $(call gb_Module_add_subsequentcheck_targets,solenv,\
@@ -39,7 +38,6 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,solenv,\
 endif
 endif
 endif
-endif
 
 ifneq ($(COMPILER_PLUGINS),)
 ifeq ($(COMPILER_EXTERNAL_TOOL)$(COMPILER_PLUGIN_TOOL),)
diff --git a/solenv/gbuild/extensions/post_GbuildToJson.mk 
b/solenv/gbuild/extensions/post_GbuildToJson.mk
index 52c61b722ee6..f1707a488f43 100644
--- a/solenv/gbuild/extensions/post_GbuildToJson.mk
+++ b/solenv/gbuild/extensions/post_GbuildToJson.mk
@@ -24,10 +24,6 @@
 
 ifneq ($(filter gbuildtojson,$(MAKECMDGOALS)),)
 
-ifeq ($(MAKE_VERSION),3.81)
-$(error make version 3.81 not supported for gbuildtojson; install newer make 
via LODE)
-endif
-
 # possibly recurse to ensure gbuildtojson was build before running the modded 
make
 gb_GbuildToJson_prep := $(shell $(MAKE) -f $(SRCDIR)/solenv/Makefile 
Executable_gbuildtojson)
 gb_FULLDEPS:=

[Libreoffice-commits] core.git: solenv/gbuild

[Stephan Bergmann (via logerrit)]

 solenv/gbuild/platform/com_MSC_class.mk |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 812081337ae6458cd14cd17e56510b7ed48acbc6
Author: Stephan Bergmann 
AuthorDate: Tue Apr 12 08:42:52 2022 +0200
Commit: Stephan Bergmann 
CommitDate: Tue Apr 12 10:05:19 2022 +0200

Delete tempfile when done

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

diff --git a/solenv/gbuild/platform/com_MSC_class.mk 
b/solenv/gbuild/platform/com_MSC_class.mk
index e82e73dd8aaa..06d21ecd474a 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -714,7 +714,8 @@ $(call gb_Helper_abbreviate_dirs,\
FILES=$(call gb_var2file,$(shell $(gb_MKTEMP)),100,$(UIFILES)) && \
$(gb_UIConfig_LXML_PATH) $(if 
$(SYSTEM_LIBXML)$(SYSTEM_LIBXSLT),,$(gb_Helper_set_ld_path)) \
$(call gb_ExternalExecutable_get_command,python) \
-   $(gb_UIConfig_gla11y_SCRIPT) $(gb_UIConfig_gla11y_PARAMETERS) -o $@ -L 
$$FILES
+   $(gb_UIConfig_gla11y_SCRIPT) $(gb_UIConfig_gla11y_PARAMETERS) -o $@ -L 
$$FILES && \
+   rm $$FILES
 )
 
 endef

[Libreoffice-commits] core.git: solenv/gbuild

[Stephan Bergmann (via logerrit)]

 solenv/gbuild/extensions/pre_MergedLibsList.mk |3 ---
 1 file changed, 3 deletions(-)

New commits:
commit 48b3894f74679a1624a92aabaabed29b90ef60cf
Author: Stephan Bergmann 
AuthorDate: Thu Feb 24 11:27:04 2022 +0100
Commit: Stephan Bergmann 
CommitDate: Thu Feb 24 13:44:50 2022 +0100

Keep URE libraries out of Library_merged

...to keep the (at least conceptional, but also reflected in how e.g. Linux
distros split up LO into multiple packages) distinction between URE and LO
proper.  This partially reverts 424a7f404565e068995e2a9827d5bc6f76920ec8 
"add
some more libs to libmerged".

Change-Id: I0bd435d9fe4dc4a4ad230990a999ad5e8c487cdf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130490
Reviewed-by: Noel Grandin 
Reviewed-by: Stephan Bergmann 
Tested-by: Jenkins

diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk 
b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index 693d3bde824d..b2402ec0c2af 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -48,9 +48,6 @@ gb_MERGE_LIBRARY_LIST := \
i18nsearch \
i18npool \
i18nutil \
-   io \
-   $(if $(ENABLE_JAVA),javaloader) \
-   $(if $(ENABLE_JAVA),javavm) \
lng \
lnth \
localebe1 \

[Libreoffice-commits] core.git: solenv/gbuild

[Stephan Bergmann (via logerrit)]

 solenv/gbuild/platform/solaris.mk |2 +-
 solenv/gbuild/platform/unxgcc.mk  |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit ba2a0eb8807409ed67af70ab828f45b69fe66c48
Author: Stephan Bergmann 
AuthorDate: Wed Feb 23 22:47:33 2022 +0100
Commit: Stephan Bergmann 
CommitDate: Thu Feb 24 09:42:39 2022 +0100

Don't run ExternalExecutable_python with LD_LIBRARY_PATH

257bcb1a1140d3e070cfaef6fec0704740bc83b8 "get internal python invocations
working" had made this use LD_LIBRARY_PATH or similar on the various 
platforms,
but without giving any reason what it would actually be good for.
5d8f48c81eac8650315b936d0e89ad1d54b566fc "solver doesn't solve anything..." 
then
(somewhat by chance?) removed it for solenv/gbuild/platform/macosx.mk,
apparently without loss of functionality, but left it intact for other
platforms.

But at least in some Jenkins Linux build environments presence of
LD_LIBRARY_PATH (pointing at instdir/program/) appears to cause subtle 
problems:
Builds like 
occasionally crashed with

[...]
> make -O
[...]
> [build PAT] python3
> [build PRJ] python3
[...]
> [build PKG] python3
> [build EPK] python3
[...]
> [build BIN] python3
[...]
> [build MOD] python3
[...]
> [build PRJ] nss
[...]
> make[1]: *** Deleting file 
'/home/tdf/lode/jenkins/workspace/lo_tb_master_linux/workdir/UIConfig/sfx.a11yerrors'
> [build UIA] sfx
> Suppression file: 
/home/tdf/lode/jenkins/workspace/lo_tb_master_linux/solenv/sanitizers/ui/sfx.suppr
> False positive file: 
/home/tdf/lode/jenkins/workspace/lo_tb_master_linux/solenv/sanitizers/ui/sfx.false
> sfx2/uiconfig/ui/documentinfopage.ui: WARNING: 'GtkLabel' 'label8' does 
not specify what it labels within 'interface'
> 1 new warning (64 suppressed by 
/home/tdf/lode/jenkins/workspace/lo_tb_master_linux/solenv/sanitizers/ui/sfx.suppr,
 please fix them)
> 0 new fatals (12 suppressed by 
/home/tdf/lode/jenkins/workspace/lo_tb_master_linux/solenv/sanitizers/ui/sfx.suppr,
 please fix them)
> Explanations are available on 
https://wiki.documentfoundation.org/Development/Accessibility
>
> /bin/sh: line 1: 31655 Segmentation fault  (core dumped) 
LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}"$I/program:$I/program" 
PYTHONHOME="$I/program/python-core-3.8.12" 
PYTHONPATH="${PYPATH:+$PYPATH:}$I/program/python-core-3.8.12/lib:$I/program/python-core-3.8.12/lib/lib-dynload"
 $I/program/python.bin $S/bin/gla11y -P $S/ -f 
$S/solenv/sanitizers/ui/sfx.false -s $S/solenv/sanitizers/ui/sfx.suppr 
--widgets-suffixignored 
+ValueSet,HBox,VBox,ToolBox,Preview,PreviewWin,PreviewWindow,PrevWindow 
--widgets-button +svtlo-ManagedMenuButton --fatal-all --not-fatal-type 
duplicate-mnemonic --not-fatal-type labelled-by-and-mnemonic --not-fatal-type 
orphan-label -o $W/UIConfig/sfx.a11yerrors 
$S/sfx2/uiconfig/ui/alienwarndialog.ui $S/sfx2/uiconfig/ui/addtargetdialog.ui 
$S/sfx2/uiconfig/ui/autoredactdialog.ui $S/sfx2/uiconfig/ui/bookmarkdialog.ui 
$S/sfx2/uiconfig/ui/bookmarkmenu.ui $S/sfx2/uiconfig/ui/charmapcontrol.ui 
$S/sfx2/uiconfig/ui/charviewmenu.ui $S/sfx2/uiconfig/ui/checkin.
 ui $S/sfx2/uiconfig/ui/classificationbox.ui 
$S/sfx2/uiconfig/ui/cmisinfopage.ui $S/sfx2/uiconfig/ui/cmisline.ui 
$S/sfx2/uiconfig/ui/commandpopup.ui $S/sfx2/uiconfig/ui/custominfopage.ui 
$S/sfx2/uiconfig/ui/deck.ui $S/sfx2/uiconfig/ui/descriptioninfopage.ui 
$S/sfx2/uiconfig/ui/developmenttool.ui $S/sfx2/uiconfig/ui/devtoolsmenu.ui 
$S/sfx2/uiconfig/ui/documentfontspage.ui 
$S/sfx2/uiconfig/ui/documentinfopage.ui 
$S/sfx2/uiconfig/ui/documentpropertiesdialog.ui 
$S/sfx2/uiconfig/ui/editdocumentdialog.ui 
$S/sfx2/uiconfig/ui/editdurationdialog.ui $S/sfx2/uiconfig/ui/emojicontrol.ui 
$S/sfx2/uiconfig/ui/extrabutton.ui $S/sfx2/uiconfig/ui/errorfindemaildialog.ui 
$S/sfx2/uiconfig/ui/floatingrecord.ui $S/sfx2/uiconfig/ui/helpbookmarkpage.ui 
$S/sfx2/uiconfig/ui/helpcontrol.ui $S/sfx2/uiconfig/ui/helpcontentpage.ui 
$S/sfx2/uiconfig/ui/helpindexpage.ui $S/sfx2/uiconfig/ui/helpmanual.ui 
$S/sfx2/uiconfig/ui/helpsearchpage.ui $S/sfx2/uiconfig/ui/helpwindow.ui 
$S/sfx2/uiconfig/ui/infobar.ui $S/sfx2/uic
 onfig/ui/inputdialog.ui $S/sfx2/uiconfig/ui/licensedialog.ui 
$S/sfx2/uiconfig/ui/linefragment.ui $S/sfx2/uiconfig/ui/linkeditdialog.ui 
$S/sfx2/uiconfig/ui/loadtemplatedialog.ui 
$S/sfx2/uiconfig/ui/managestylepage.ui $S/sfx2/uiconfig/ui/navigator.ui 
$S/sfx2/uiconfig/ui/newstyle.ui $S/sfx2/uiconfig/ui/notebookbar.ui 
$S/sfx2/uiconfig/ui/optprintpage.ui $S/sfx2/uiconfig/ui/panel.ui 
$S/sfx2/uiconfig/ui/password.ui $S/sfx2/uiconfig/ui/notebookbarpopup.ui 
$S/sfx2/uiconfig/ui/printeroptionsdialog.ui 
$S/sfx2/uiconfig/ui/querysavedialog.ui $S/sfx2/uiconfig/ui/saveastemplatedlg.ui 
$S/sfx2/uiconfig/ui/safemodequerydialog.ui $S/sfx2/uiconfig/ui/searchdialog.ui 

[Libreoffice-commits] core.git: solenv/gbuild

[Stephan Bergmann (via logerrit)]

 solenv/gbuild/platform/com_MSC_defs.mk |1 -
 solenv/gbuild/platform/solaris.mk  |1 -
 solenv/gbuild/platform/unxgcc.mk   |1 -
 3 files changed, 3 deletions(-)

New commits:
commit cf07bcddd79beb6a0920384690a162c847801d7c
Author: Stephan Bergmann 
AuthorDate: Thu Feb 17 09:10:25 2022 +0100
Commit: Stephan Bergmann 
CommitDate: Thu Feb 17 12:56:19 2022 +0100

Drop -Wdeclaration-after-statement

It was introduced, without a rationale, into unxgcc.mk in
eb09adaa9a2accbdc3531bb96447c8e7fbb9f8a9 "Warn if declaration follows
statement in C-files", then carried over to clang-cl (com_MSC_defs.mk) with
9055fb48402eaeb9ba876b7893e2f9a39fea06b1 "clang-cl: Enable more warnings 
etc.
(like in the Clang/GCC case)", where it now started to cause

> cppuhelper/source/findsofficepath.c(102,20): error: mixing declarations 
and code is incompatible with standards before C99 
[-Werror,-Wdeclaration-after-statement]
> const wchar_t* SUBKEYNAME = 
L"Software\\LibreOffice\\UNO\\InstallPath";
>^

after


"[clang][#51931] Enable -Wdeclaration-after-statement for all C versions".

Lets remove it from all toolchain settings, there appears to be not much 
value
anymore in such a warning about pre-C99 code.

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

diff --git a/solenv/gbuild/platform/com_MSC_defs.mk 
b/solenv/gbuild/platform/com_MSC_defs.mk
index 7620adab7e79..364c0011f38a 100644
--- a/solenv/gbuild/platform/com_MSC_defs.mk
+++ b/solenv/gbuild/platform/com_MSC_defs.mk
@@ -280,7 +280,6 @@ gb_CXXCLRFLAGS := \
 ifeq ($(COM_IS_CLANG),TRUE)
 
 gb_CFLAGS += \
-   -Wdeclaration-after-statement \
-Wendif-labels \
-Wshadow \
-Wstrict-prototypes \
diff --git a/solenv/gbuild/platform/solaris.mk 
b/solenv/gbuild/platform/solaris.mk
index 3f9e0fde335e..0f396dd8e80e 100644
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@ -43,7 +43,6 @@ gb_OSDEFS := \
 gb_CFLAGS := \
$(gb_CFLAGS_COMMON) \
-fPIC \
-   -Wdeclaration-after-statement \
-Wshadow \
 
 gb_CXXFLAGS := \
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index c70e3ce222bb..a0aead205c12 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -39,7 +39,6 @@ gb_OSDEFS := \
 gb_CFLAGS := \
$(gb_CFLAGS_COMMON) \
-fPIC \
-   -Wdeclaration-after-statement \
-Wshadow \
 
 # At least libstdc++ needs -pthread when including various C++ headers like 
, see

[Libreoffice-commits] core.git: solenv/gbuild

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

 solenv/gbuild/ExternalProject.mk |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 0e3092fd6c8dc8908bd7820a4eb858771ca7eb00
Author: Luboš Luňák 
AuthorDate: Sun Feb 13 01:18:10 2022 +0100
Commit: Luboš Luňák 
CommitDate: Sun Feb 13 13:17:51 2022 +0100

set up gb_COMPILER_SETUP properly for gb_ExternalProject_run

If the command to run would be "cmd1 && cmd2", the old way would
set up the variables only for the first command.

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

diff --git a/solenv/gbuild/ExternalProject.mk b/solenv/gbuild/ExternalProject.mk
index 94f8daee37fc..ef10c1d2884f 100644
--- a/solenv/gbuild/ExternalProject.mk
+++ b/solenv/gbuild/ExternalProject.mk
@@ -222,7 +222,8 @@ $(call gb_Helper_print_on_error,cd $(EXTERNAL_WORKDIR)/$(3) 
&& \
unset Platform && \
$(if $(WRAPPERS),export $(WRAPPERS) &&) \
$(if $(NMAKE),export $(NMAKE) &&) \
-   $(gb_COMPILER_SETUP) $(2) && touch $@,$(EXTERNAL_WORKDIR)/$(if 
$(3),$(3)/,)$(if $(4),$(4),$(1).log))
+   $(if $(gb_COMPILER_SETUP),export $(gb_COMPILER_SETUP) &&) \
+   $(2) && touch $@,$(EXTERNAL_WORKDIR)/$(if $(3),$(3)/,)$(if 
$(4),$(4),$(1).log))
 )
 endef
 

[Libreoffice-commits] core.git: solenv/gbuild

[Jan-Marek Glogowski (via logerrit)]

 solenv/gbuild/ComponentTarget.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2483cd198b51bd5d0819cbebf40f211b2ef1236d
Author: Jan-Marek Glogowski 
AuthorDate: Fri Feb 11 19:40:36 2022 +0100
Commit: Jan-Marek Glogowski 
CommitDate: Fri Feb 11 20:46:21 2022 +0100

Correctly depend on source component file

Regression from commit 17ec55c48082254e1f55bcfa00808e45a50a9801
("Fail on non-optional, but filtered component names").

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

diff --git a/solenv/gbuild/ComponentTarget.mk b/solenv/gbuild/ComponentTarget.mk
index aed3fd88e889..3ba9cdb00d6b 100644
--- a/solenv/gbuild/ComponentTarget.mk
+++ b/solenv/gbuild/ComponentTarget.mk
@@ -102,7 +102,7 @@ $(call gb_ComponentTarget_get_target,$(1)) : 
COMPONENTSOURCE := $(call gb_Compon
 $(call gb_ComponentTarget_get_target,$(1)) : COMPONENTIMPL :=
 $(call gb_ComponentTarget_get_target,$(1)) : ALLFILTEREDIMPL := $(call 
gb_ComponentTarget__init_allfiltered,$(1))
 
-$(call gb_ComponentTarget_get_target,$(1)) : $(call 
gb_ComponentTarget__source,$(1))
+$(call gb_ComponentTarget_get_target,$(1)) : $(call 
gb_ComponentTarget__init_source,$(1))
 $(call gb_ComponentTarget_get_target,$(1)).optionals : $(call 
gb_ComponentTarget__init_source,$(1))
 $(call gb_ComponentTarget_get_target,$(1)).allfiltered : $(call 
gb_ComponentTarget__init_allfiltered,$(1))
 

[Libreoffice-commits] core.git: solenv/gbuild

[Michael Stahl (via logerrit)]

 solenv/gbuild/LinkTarget.mk |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 822b551f6ca92c9d4a8fb17dfc7ba28c272794cc
Author: Michael Stahl 
AuthorDate: Tue Jan 25 15:22:01 2022 +0100
Commit: Stephan Bergmann 
CommitDate: Wed Jan 26 08:07:46 2022 +0100

gbuild: fix spurious rebuilds from gb_LinkTarget__use_libraries

Apparently the eval inside of "ifeq" needs to be escaped, currently both
branches of the "ifeq" are evaluated and generate makefile dependencies,
which causes spurious rebuild of Library_salhelper with
DISABLE_DYNLOADING unset from:
 make Library_salhelper && touch -c ../master/sal/osl/all/compat.cxx && 
make Library_salhelper

(regression from ecc50f56b3282ec3b0364101d860f22fe8da9042)

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

diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index bb6b4b1fedbc..86533ab3f60f 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -1326,7 +1326,7 @@ ifeq (,$(DISABLE_DYNLOADING))
 # for faster incremental builds when the ABI is unchanged.
 # export files are created from the library, so this also ensures the library 
exists.
 $(foreach lib,$(call gb_LinkTarget__filter_lo_libraries,$(3)),$(if $(filter 
$(lib),$(gb_Library_KNOWNLIBS)), \
-$(eval $(call gb_LinkTarget_get_target,$(1)) : $(call 
gb_Library_get_exports_target,$(lib))) \
+$$(eval $(call gb_LinkTarget_get_target,$(1)) : $(call 
gb_Library_get_exports_target,$(lib))) \
 ))
 
 else # DISABLE_DYNLOADING
@@ -1335,7 +1335,7 @@ ifneq (,$(call gb_LinkTarget_does_real_link,$(1)))
 $(call gb_LinkTarget_get_target,$(1)) : T_LIBS += $(call 
gb_LinkTarget__filter_sys_libraries,$(3))
 $(if $(filter-out Library,gb_LinkTarget__get_workdir_linktargetclass,$(1)), \
 $(foreach lib,$(call gb_LinkTarget__filter_lo_libraries,$(3)),$(if 
$(filter $(lib),$(gb_Library_KNOWNLIBS)), \
-$(eval $(call gb_LinkTarget_get_target,$(1)) : $(call 
gb_Library_get_linktarget_target,$(lib))) \
+$$(eval $(call gb_LinkTarget_get_target,$(1)) : $(call 
gb_Library_get_linktarget_target,$(lib))) \
 )))
 endif
 endif # DISABLE_DYNLOADING

[Libreoffice-commits] core.git: solenv/gbuild

[Arjun (via logerrit)]

 solenv/gbuild/Output.mk|   14 +++---
 solenv/gbuild/extensions/pre_MergedLibsList.mk |6 +++---
 solenv/gbuild/platform/com_MSC_class.mk|4 ++--
 3 files changed, 12 insertions(+), 12 deletions(-)

New commits:
commit 1cc2690fe2f87e8acce4e9b4e0cb533fda26e295
Author: Arjun 
AuthorDate: Sun Jan 23 16:14:07 2022 +0530
Commit: Ilmari Lauhakangas 
CommitDate: Sun Jan 23 17:54:44 2022 +0100

tdf#97046 prefix gb_ to system variables

Change-Id: I8be2f55e3306d7ac34ea5819ab93fd537315b281
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128804
Tested-by: Ilmari Lauhakangas 
Reviewed-by: Ilmari Lauhakangas 

diff --git a/solenv/gbuild/Output.mk b/solenv/gbuild/Output.mk
index 4e3b5b92ef22..c4b992df4443 100644
--- a/solenv/gbuild/Output.mk
+++ b/solenv/gbuild/Output.mk
@@ -61,13 +61,13 @@ endif
 # only enable colorized output if
 # - gb_COLOR is set
 # - we have a known term
-KNOWN_TERM:=Eterm aterm gnome kterm linux putty rxvt rxvt-unicode screen xterm 
xterm xtermc cygwin
-KNOWN_TERM+=$(patsubst %,%-color,$(KNOWN_TERM))
-KNOWN_TERM+=$(patsubst %-color,%-256color,$(KNOWN_TERM))
-KNOWN_TERM+=$(patsubst %-color,%+256color,$(KNOWN_TERM))
-KNOWN_TERM+=$(patsubst %,screen.%,$(KNOWN_TERM))
+gb_KNOWN_TERM:=Eterm aterm gnome kterm linux putty rxvt rxvt-unicode screen 
xterm xterm xtermc cygwin
+gb_KNOWN_TERM+=$(patsubst %,%-color,$(gb_KNOWN_TERM))
+gb_KNOWN_TERM+=$(patsubst %-color,%-256color,$(gb_KNOWN_TERM))
+gb_KNOWN_TERM+=$(patsubst %-color,%+256color,$(gb_KNOWN_TERM))
+gb_KNOWN_TERM+=$(patsubst %,screen.%,$(gb_KNOWN_TERM))
 ifneq ($(strip $(gb_COLOR)),)
-ifneq ($(filter $(TERM),$(KNOWN_TERM)),)
+ifneq ($(filter $(TERM),$(gb_KNOWN_TERM)),)
 
 gb_Output_COLOR_RESET := $(gb_Output_ESCAPE)[0m
 gb_Output_COLOR_RESETANDESCAPE := $(gb_Output_COLOR_RESET)$(gb_Output_ESCAPE)
@@ -127,7 +127,7 @@ endif
 # - gb_TITLES is set
 # - we have a known term
 ifneq ($(strip $(gb_TITLES)),)
-ifneq ($(filter $(TERM),$(KNOWN_TERM)),)
+ifneq ($(filter $(TERM),$(gb_KNOWN_TERM)),)
 define gb_Output_announce_title
 $(info $(gb_Output_ESCAPE)]2;gbuild: 
$(1)$(gb_Output_BELL)$(gb_Output_ESCAPE)[A)
 endef
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk 
b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index d5bf6f9c0862..693d3bde824d 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -8,7 +8,7 @@
 #
 
 # we link all object files from these libraries into one, merged library
-MERGE_LIBRARY_LIST := \
+gb_MERGE_LIBRARY_LIST := \
avmedia \
$(if $(filter WNT,$(OS)),avmediawin) \
$(call gb_Helper_optional,SCRIPTING, \
@@ -112,13 +112,13 @@ MERGE_LIBRARY_LIST := \
 # allow module-deps.pl to color based on this.
 ifneq ($(ENABLE_PRINT_DEPS),)
 
-$(info MergeLibContents: $(MERGE_LIBRARY_LIST))
+$(info MergeLibContents: $(gb_MERGE_LIBRARY_LIST))
 
 endif
 
 ifneq ($(MERGELIBS),)
 
-gb_MERGEDLIBS := $(MERGE_LIBRARY_LIST)
+gb_MERGEDLIBS := $(gb_MERGE_LIBRARY_LIST)
 
 endif
 
diff --git a/solenv/gbuild/platform/com_MSC_class.mk 
b/solenv/gbuild/platform/com_MSC_class.mk
index 28657adb6aae..e82e73dd8aaa 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -241,7 +241,7 @@ cat $${RESPONSEFILE} | sed 's/ /\n/g' | grep -v '^$$' > 
$${RESPONSEFILE}.1 && \
 mv $${RESPONSEFILE}.1 $${RESPONSEFILE} &&
 endef
 
-MSC_SUBSYSTEM_VERSION=$(COMMA)$(if $(filter AARCH64,$(CPUNAME)),6.02,6.01)
+gb_MSC_SUBSYSTEM_VERSION=$(COMMA)$(if $(filter AARCH64,$(CPUNAME)),6.02,6.01)
 
 # the sort on the libraries is used to filter out duplicates to keep 
commandline
 # length in check - otherwise the dupes easily hit the limit when linking 
mergedlib
@@ -268,7 +268,7 @@ $(call gb_Helper_abbreviate_dirs,\
$(if $(filter StaticLibrary,$(TARGETTYPE)),-LIB) \
$(if $(filter 
Executable,$(TARGETTYPE)),$(gb_Executable_TARGETTYPEFLAGS)) \
$(if $(T_SYMBOLS),$(if $(filter Executable Library 
CppunitTest,$(TARGETTYPE)),$(gb_Windows_PE_TARGETTYPEFLAGS_DEBUGINFO)),) \
-   $(if $(filter YES,$(TARGETGUI)), 
-SUBSYSTEM:WINDOWS$(MSC_SUBSYSTEM_VERSION), 
-SUBSYSTEM:CONSOLE$(MSC_SUBSYSTEM_VERSION)) \
+   $(if $(filter YES,$(TARGETGUI)), 
-SUBSYSTEM:WINDOWS$(gb_MSC_SUBSYSTEM_VERSION), 
-SUBSYSTEM:CONSOLE$(gb_MSC_SUBSYSTEM_VERSION)) \
$(if $(filter YES,$(LIBRARY_X64)), -MACHINE:X64) \
$(if $(filter YES,$(PE_X86)), -MACHINE:X86) \
$(if $(filter YES,$(LIBRARY_X64)), \

[Libreoffice-commits] core.git: solenv/gbuild

[Andrea Gelmini (via logerrit)]

 solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2d9036fa313712a8aff9aee37bb3136a960fd392
Author: Andrea Gelmini 
AuthorDate: Wed Jan 19 16:40:44 2022 +0100
Commit: Jan-Marek Glogowski 
CommitDate: Wed Jan 19 19:22:47 2022 +0100

Fix typo

emscripten.py is not in the LO source, but in the emscripten project.
Guess they were referring that one.

Change-Id: I3ad2b4ad90420a554871cfd1aba94b447c275127
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128619
Tested-by: Jenkins
Reviewed-by: Julien Nabet 
Reviewed-by: Jan-Marek Glogowski 

diff --git a/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk 
b/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk
index 8d95a8567576..a0ba51da2e4f 100644
--- a/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk
@@ -25,7 +25,7 @@ gb_EMSCRIPTEN_LDFLAGS := $(gb_EMSCRIPTEN_CPPFLAGS)
 gb_EMSCRIPTEN_LDFLAGS += -s TOTAL_MEMORY=1GB -s PTHREAD_POOL_SIZE=4
 
 # To keep the link time (and memory) down, prevent all rewriting options from 
wasm-emscripten-finalize
-# See emscrypten.py, finalize_wasm, modify_wasm = True
+# See emscripten.py, finalize_wasm, modify_wasm = True
 # So we need WASM_BIGINT=1 and ASSERTIONS=1 (2 implies STACK_OVERFLOW_CHECK)
 gb_EMSCRIPTEN_LDFLAGS += --bind -s FORCE_FILESYSTEM=1 -s WASM_BIGINT=1 -s 
ERROR_ON_UNDEFINED_SYMBOLS=1 -s FETCH=1 -s ASSERTIONS=1 -s EXIT_RUNTIME=0 -s 
EXPORTED_RUNTIME_METHODS=["UTF16ToString","stringToUTF16","printErr"]
 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

[Libreoffice-commits] core.git: solenv/gbuild

[Jan-Marek Glogowski (via logerrit)]

 solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk |   17 ++---
 1 file changed, 14 insertions(+), 3 deletions(-)

New commits:
commit f090004c5f236275ca5142fc578f0375872c0336
Author: Jan-Marek Glogowski 
AuthorDate: Tue Dec 7 06:28:44 2021 +0100
Commit: Jan-Marek Glogowski 
CommitDate: Wed Jan 19 10:56:17 2022 +0100

WASM adapt link and debug flags

Changes the linker flags, so a debug build will not rewrite the
WASM binary code for instrumentation, as this takes ages and more
then 64GB of RAM, currently.

For the same reason - long link times - prefer DWARF debugging to
the external source maps.

Initial memory and thread pool size are linker flags, so move them.

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

diff --git a/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk 
b/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk
index 3a7441454f0d..2dd31741d3a0 100644
--- a/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk
@@ -13,13 +13,22 @@ include $(GBUILDDIR)/platform/unxgcc.mk
 
 gb_RUN_CONFIGURE := $(SRCDIR)/solenv/bin/run-configure
 # avoid -s SAFE_HEAP=1 - c.f. gh#8584 this breaks source maps
-gb_EMSCRIPTEN_CPPFLAGS := -pthread -s TOTAL_MEMORY=1GB -s USE_PTHREADS=1 -s 
PTHREAD_POOL_SIZE=4
-gb_EMSCRIPTEN_LDFLAGS := $(gb_EMSCRIPTEN_CPPFLAGS) --bind -s 
ERROR_ON_UNDEFINED_SYMBOLS=1 -s FETCH=1 -s ASSERTIONS=2 -s EXIT_RUNTIME=1 -s 
EXTRA_EXPORTED_RUNTIME_METHODS=["UTF16ToString","stringToUTF16"]
+gb_EMSCRIPTEN_CPPFLAGS := -pthread -s USE_PTHREADS=1
+gb_EMSCRIPTEN_LDFLAGS := $(gb_EMSCRIPTEN_CPPFLAGS)
+
+# Initial memory size and worker thread pool
+gb_EMSCRIPTEN_LDFLAGS += -s TOTAL_MEMORY=1GB -s PTHREAD_POOL_SIZE=4
+
+# To keep the link time (and memory) down, prevent all rewriting options from 
wasm-emscripten-finalize
+# See emscrypten.py, finalize_wasm, modify_wasm = True
+# So we need WASM_BIGINT=1 and ASSERTIONS=1 (2 implies STACK_OVERFLOW_CHECK)
+gb_EMSCRIPTEN_LDFLAGS += --bind -s WASM_BIGINT=1 -s 
ERROR_ON_UNDEFINED_SYMBOLS=1 -s FETCH=1 -s ASSERTIONS=1 -s EXIT_RUNTIME=0 -s 
EXPORTED_RUNTIME_METHODS=["UTF16ToString","stringToUTF16","printErr"]
 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
 
+gb_CXXFLAGS += $(gb_EMSCRIPTEN_CPPFLAGS)
 gb_LinkTarget_CFLAGS += $(gb_EMSCRIPTEN_CPPFLAGS) $(gb_EMSCRIPTEN_QTDEFS)
 gb_LinkTarget_CXXFLAGS += $(gb_EMSCRIPTEN_CPPFLAGS) $(gb_EMSCRIPTEN_QTDEFS) 
$(gb_EMSCRIPTEN_EXCEPT)
 gb_LinkTarget_LDFLAGS += $(gb_EMSCRIPTEN_LDFLAGS) $(gb_EMSCRIPTEN_CPPFLAGS) 
$(gb_EMSCRIPTEN_EXCEPT)
@@ -27,8 +36,10 @@ gb_LinkTarget_LDFLAGS += $(gb_EMSCRIPTEN_LDFLAGS) 
$(gb_EMSCRIPTEN_CPPFLAGS) $(gb
 # Linker and compiler optimize + debug flags are handled in LinkTarget.mk
 gb_LINKEROPTFLAGS :=
 gb_LINKERSTRIPDEBUGFLAGS :=
-# This maps to g4, AKA source maps. The LO default would otherwise be g2!
+# This maps to g3, no source maps, but DWARF with current emscripten!
+# https://developer.chrome.com/blog/wasm-debugging-2020/
 gb_DEBUGINFO_FLAGS = -g
+#gb_DEBUGINFO_FLAGS = -gsource-map 
--source-map-base=file://$(WORKDIR)/LinkTarget/Executable
 # We need at least code elimination, otherwise linking OOMs even with 64GB.
 # So we "fake" -Og support to mean -O1 for Emscripten and always enable it for 
debug in configure.
 gb_COMPILERDEBUGOPTFLAGS := -O1

[Libreoffice-commits] core.git: solenv/gbuild

[Jan-Marek Glogowski (via logerrit)]

 solenv/gbuild/ComponentTarget.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit f4a1099abd5a5951f0993f197f33e0c7d1837501
Author: Jan-Marek Glogowski 
AuthorDate: Wed Jan 19 07:06:17 2022 +0100
Commit: Jan-Marek Glogowski 
CommitDate: Wed Jan 19 08:21:43 2022 +0100

Keep intermediate *.component.filtered file

Makes debugging / understanding componentfile generation easier.

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

diff --git a/solenv/gbuild/ComponentTarget.mk b/solenv/gbuild/ComponentTarget.mk
index 9a33f1aa46b7..d317f1b05ae7 100644
--- a/solenv/gbuild/ComponentTarget.mk
+++ b/solenv/gbuild/ComponentTarget.mk
@@ -64,6 +64,7 @@ $(call gb_ComponentTarget_get_target,%).optionals : \
$(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 '/^#\|^\s*$$/d' | sort | uniq -u > $@
 

[Libreoffice-commits] core.git: solenv/gbuild svx/Module_svx.mk

[Jan-Marek Glogowski (via logerrit)]

 solenv/gbuild/ExternalProject.mk |4 +--
 solenv/gbuild/LinkTarget.mk  |   45 +++
 solenv/gbuild/TargetLocations.mk |7 ++
 solenv/gbuild/partial_build.mk   |4 +++
 solenv/gbuild/static.mk  |   42 +++-
 svx/Module_svx.mk|2 +
 6 files changed, 101 insertions(+), 3 deletions(-)

New commits:
commit b04be559ddf4a7f0a5cdc0b9abc2bcfc4aae25cc
Author: Jan-Marek Glogowski 
AuthorDate: Fri May 21 15:41:15 2021 +0200
Commit: Thorsten Behrens 
CommitDate: Thu Jan 13 12:13:06 2022 +0100

gbuild: implement static partial build

This stores all the dependencies collected from the full build,
and uses that info to link static binaries in per module.

Change-Id: I27bd41c217bf0d2248ee88004038dd6b813f2624
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128129
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
Reviewed-by: Thorsten Behrens 

diff --git a/solenv/gbuild/ExternalProject.mk b/solenv/gbuild/ExternalProject.mk
index 6f703f256174..94f8daee37fc 100644
--- a/solenv/gbuild/ExternalProject.mk
+++ b/solenv/gbuild/ExternalProject.mk
@@ -184,9 +184,9 @@ endef
 #
 # gb_ExternalProject_use_libraries external libraries
 define gb_ExternalProject_use_libraries
-ifneq (,$$(filter-out $(gb_Library_KNOWNLIBS),$(2)))
+ifneq (,$$(filter-out $(gb_Library_KNOWNLIBS) $(gb_LinkTarget__syslib),$(2)))
 $$(eval $$(call gb_Output_info,currently known libraries are: $(sort 
$(gb_Library_KNOWNLIBS)),ALL))
-$$(eval $$(call gb_Output_error,Cannot link against library/libraries 
$$(filter-out $(gb_Library_KNOWNLIBS),$(2)). Libraries must be registered in 
Repository.mk or RepositoryExternal.mk))
+$$(eval $$(call gb_Output_error,Cannot link against library/libraries 
$$(filter-out $(gb_Library_KNOWNLIBS) $(gb_LinkTarget__syslib),$(2)). Libraries 
must be registered in Repository.mk or RepositoryExternal.mk))
 endif
 ifneq (,$$(filter $$(gb_MERGEDLIBS),$(2)))
 $$(eval $$(call gb_Output_error,Cannot link against library/libraries 
$$(filter $$(gb_MERGEDLIBS),$(2)) because they are merged.))
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index b7cada89523b..a4cbaf65bdd3 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -763,6 +763,11 @@ $(WORKDIR)/Clean/LinkTarget/% :
$(foreach object,$(GENCXXCLROBJECTS),$(call 
gb_GenCxxClrObject_get_dwo_target,$(object))) \
$(call gb_LinkTarget_get_target,$(LINKTARGET)) \
$(call gb_LinkTarget_get_dep_target,$(LINKTARGET)) \
+   $(if $(gb_PARTIAL_BUILD),, \
+   $(call 
gb_LinkTarget_get_dep_libraries_target,$(LINKTARGET)) \
+   $(call 
gb_LinkTarget_get_dep_externals_target,$(LINKTARGET)) \
+   $(call 
gb_LinkTarget_get_dep_statics_target,$(LINKTARGET)) \
+   ) \
$(call gb_LinkTarget_get_headers_target,$(LINKTARGET)) \
$(call gb_LinkTarget_get_objects_list,$(LINKTARGET)) \
$(call 
gb_LinkTarget_get_pch_timestamp,$(LINKTARGETMAKEFILENAME)) \
@@ -856,6 +861,13 @@ endef
 # call gb_LinkTarget__command_impl,linktargettarget,linktargetname
 define gb_LinkTarget__command_impl
$(if $(gb_FULLDEPS),
+   $(if $(ENABLE_CUSTOMTARGET_COMPONENTS),$(if 
$(gb_PARTIAL_BUILD),,
+   $(call gb_LinkTarget__command_dep_libraries,$(call 
gb_LinkTarget_get_dep_libraries_target,$(2)).tmp,$(2))
+   mv $(call 
gb_LinkTarget_get_dep_libraries_target,$(2)).tmp $(call 
gb_LinkTarget_get_dep_libraries_target,$(2))
+   $(call gb_LinkTarget__command_dep_externals,$(call 
gb_LinkTarget_get_dep_externals_target,$(2)).tmp,$(2))
+   mv $(call 
gb_LinkTarget_get_dep_externals_target,$(2)).tmp $(call 
gb_LinkTarget_get_dep_externals_target,$(2))
+   $(call gb_LinkTarget__command_dep_statics,$(call 
gb_LinkTarget_get_dep_statics_target,$(2)).tmp,$(2))
+   mv $(call 
gb_LinkTarget_get_dep_statics_target,$(2)).tmp $(call 
gb_LinkTarget_get_dep_statics_target,$(2
$(if $(findstring concat-deps,$(2)),,
$(call gb_LinkTarget__command_dep,$(call 
gb_LinkTarget_get_dep_target,$(2)).tmp,$(2))
mv $(call gb_LinkTarget_get_dep_target,$(2)).tmp $(call 
gb_LinkTarget_get_dep_target,$(2
@@ -872,6 +884,35 @@ endef
 ifeq ($(gb_FULLDEPS),$(true))
 $(call gb_LinkTarget_get_dep_target,%) : $(call 
gb_Executable_get_runtime_dependencies,concat-deps)
$(call gb_LinkTarget__command_dep,$@,$*)
+
+$(dir $(call gb_LinkTarget_get_dep_target,%))/.dir :
+   $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
+
+ifeq ($(ENABLE_CUSTOMTARGET_COMPONENTS),TRUE)
+ifeq (,$(gb_PARTIAL_BUILD))
+
+define gb_LinkTarget__static_dep_x_template
+
+define 

[Libreoffice-commits] core.git: solenv/gbuild

[Andrea Gelmini (via logerrit)]

 solenv/gbuild/platform/unxgcc.mk |2 +-
 solenv/gbuild/static.mk  |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit dd7f4f02a547d0437b65adf6966fb7a9520b9dd0
Author: Andrea Gelmini 
AuthorDate: Wed Jan 12 13:21:10 2022 +0100
Commit: Julien Nabet 
CommitDate: Wed Jan 12 18:12:36 2022 +0100

Fix typos

Change-Id: I47fc636e0b69b72fb6ca247f9e0cbabbddb3985e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128321
Tested-by: Julien Nabet 
Reviewed-by: Julien Nabet 

diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index b3efff76f892..e24aaa4e1fe6 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -115,7 +115,7 @@ $(if $(strip $(and \
 )),$(true))
 endef
 
-# In theory would would need to track, if any of the linked objects is C++ 
code, so for the static build we assume yes :-(
+# In theory would need to track, if any of the linked objects is C++ code, so 
for the static build we assume yes :-(
 gb_LinkTarget__NeedsCxxLinker = $(if 
$(CXXOBJECTS)$(GENCXXOBJECTS)$(EXTRAOBJECTLISTS)$(filter-out 
XTRUE,X$(ENABLE_RUNTIME_OPTIMIZATIONS)$(DISABLE_DYNLOADING)),$(true))
 
 # note that `cat $(extraobjectlist)` is needed to build with older gcc 
versions, e.g. 4.1.2 on SLED10
diff --git a/solenv/gbuild/static.mk b/solenv/gbuild/static.mk
index 346a18991134..a32060ca3c58 100644
--- a/solenv/gbuild/static.mk
+++ b/solenv/gbuild/static.mk
@@ -16,7 +16,7 @@
 #
 # "Generic" comment from the author:
 # My thought was: the dependency info is already there. Can't be too hard to 
use it for
-# correct static linkage... well it took more then two weeks to hopefully 
identify all
+# correct static linkage... well it took more than two weeks to hopefully 
identify all
 # problems / edge cases. Now I can appreciate the usage bin/lo-all-static-libs 
even more.
 #
 # This code moved a few times to the various gbuild / make phases: Makefile / 
module

[Libreoffice-commits] core.git: solenv/gbuild

[Jan-Marek Glogowski (via logerrit)]

 solenv/gbuild/LinkTarget.mk |   19 ++-
 1 file changed, 10 insertions(+), 9 deletions(-)

New commits:
commit 32bf2040bfa9d76731fc7c679845eb3835dde8a3
Author: Jan-Marek Glogowski 
AuthorDate: Wed Jan 5 11:56:30 2022 +0100
Commit: Jan-Marek Glogowski 
CommitDate: Fri Jan 7 02:51:50 2022 +0100

gbuild: fix actually used libraries for mergelib

Just the $(filter $(gb_MERGEDLIBS),$(2)) in the "if" was wrong,
but reformat and add a comment to make the code easier to read.

This way we correctly header-depend on all requested libraries,
but just export-depend on the real libraries.

And actually use gb_LinkTarget__is_build_lib in the ifeq, as
otherwise the build now fails for the reduced dependencies.

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

diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 52eabb9e5b96..ce60b462ecee 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -1246,7 +1246,8 @@ $(foreach lib,$(2),$(call 
gb_LinkTarget__lib_dummy_depend,$(lib)))
 endef
 
 # libraries which are merged but need to be built for gb_BUILD_HELPER_TOOLS
-gb_BUILD_HELPER_LIBS := basegfx \
+gb_BUILD_HELPER_LIBS := $(foreach lib, \
+basegfx \
comphelper \
cppu \
cppuhelper \
@@ -1260,6 +1261,7 @@ gb_BUILD_HELPER_LIBS := basegfx \
ucbhelper \
unoidl \
xmlreader \
+, $(call gb_Library__get_workdir_linktargetname,$(lib)))
 
 # tools libmerged depends on, so they link against gb_BUILD_HELPER_LIBS
 gb_BUILD_HELPER_TOOLS := $(foreach exe,\
@@ -1271,12 +1273,12 @@ gb_BUILD_HELPER_TOOLS := $(foreach exe,\
 
 # call gb_LinkTarget__is_build_lib,linktargetname
 define gb_LinkTarget__is_build_lib
-$(if $(filter $(call gb_LinkTarget__get_workdir_linktargetname,$(1)),$(foreach 
lib,$(gb_BUILD_HELPER_LIBS),$(call 
gb_Library__get_workdir_linktargetname,$(lib,$(true),$(false))
+$(if $(filter $(call gb_LinkTarget__get_workdir_linktargetname,$(1)),$(call 
gb_BUILD_HELPER_LIBS)),$(true))
 endef
 
 # call gb_LinkTarget__is_build_tool,linktargetname
 define gb_LinkTarget__is_build_tool
-$(if $(filter $(call gb_LinkTarget__get_workdir_linktargetname,$(1)),$(call 
gb_BUILD_HELPER_TOOLS)),$(true),$(false))
+$(if $(filter $(call gb_LinkTarget__get_workdir_linktargetname,$(1)),$(call 
gb_BUILD_HELPER_TOOLS)),$(true))
 endef
 
 define gb_LinkTarget__is_merged
@@ -1295,15 +1297,14 @@ $$(eval $$(call gb_Output_error,Cannot link against 
plugin library/libraries '$$
 endif
 endif
 
-ifeq ($(call gb_LinkTarget__is_build_tool,$(1)),$(true))
+ifeq ($(call gb_LinkTarget__is_build_tool,$(1))$(call 
gb_LinkTarget__is_build_lib,$(1)),$(true))
 $(call gb_LinkTarget__use_libraries,$(1),$(2),$(2),$(4))
 else
+# $$(3) = Always just depend on non-merged libs. If any dependency is merged, 
but you aren't, also depend on "merged".
 $(call gb_LinkTarget__use_libraries,$(1),$(2),$(strip \
-   $(if $(filter $(gb_MERGEDLIBS),$(2)), \
-   $(if $(call gb_LinkTarget__is_merged,$(1)), \
-   $(filter $(gb_MERGEDLIBS),$(2)), merged)) \
-   $(filter-out $(gb_MERGEDLIBS),$(2)) \
-   ),$(4))
+$(filter-out $(gb_MERGEDLIBS),$(2)) \
+$(if $(filter $(gb_MERGEDLIBS),$(2)),$(if $(call 
gb_LinkTarget__is_merged,$(1)),,merged)) \
+),$(4))
 endif
 
 endef

[Libreoffice-commits] core.git: solenv/gbuild

[Jan-Marek Glogowski (via logerrit)]

 solenv/gbuild/LinkTarget.mk |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 86b0753ca3a02d247b13f0a6654ae315ce3a044b
Author: Jan-Marek Glogowski 
AuthorDate: Wed Jan 5 12:13:11 2022 +0100
Commit: Jan-Marek Glogowski 
CommitDate: Wed Jan 5 22:19:18 2022 +0100

gbuild: skip libmerged externals for partial builds

When running a full build, all externals of merged libraries are
also added to libmerged when adding externals for the merged lib.

Non-skipping for partial builds also breaks gbuildtojson, for all
modules, which are merged and have additional libraries, tests or
binaries, which then depend on the libmerged.

This triggers for gbuildtojson, because the skipped %.exports now
actually matter when checking the libmerged state. make then tries
to rebuild it, but this can never work for a partial build, even
with the full gbuild ruleset, not stripped by
solenv/gbuild/extensions/post_GbuildToJson.mk.

The totally confusing result, due to the mangled ruleset, is that
the first externals %.exports overwrites libmerged in instdir.

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

diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 3f4e329587b8..52eabb9e5b96 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -2031,8 +2031,10 @@ endef
 # call gb_LinkTarget_use_external,linktarget,external
 define gb_LinkTarget_use_external
 $(if $(filter undefined,$(origin gb_LinkTarget__use_$(2))),\
-  $(error gb_LinkTarget_use_external: unknown external: $(2)),\
-  $(if $(call gb_LinkTarget__is_merged,$(1)),$(call 
gb_LinkTarget__use_$(2),$(call gb_Library_get_linktarget,merged))) \
+$(error gb_LinkTarget_use_external: unknown external: $(2)) \
+, \
+$(if $(gb_PARTIAL_BUILD),,$(if $(call gb_LinkTarget__is_merged,$(1)), \
+$(call gb_LinkTarget__use_$(2),$(call 
gb_Library_get_linktarget,merged \
 $(call gb_LinkTarget__use_$(2),$(1)) \
 )
 endef

[Libreoffice-commits] core.git: solenv/gbuild

[Caolán McNamara (via logerrit)]

 solenv/gbuild/extensions/post_Fuzzers.mk |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit f3dce2a4039ce16593a084480d1fc6f82ce9b147
Author: Caolán McNamara 
AuthorDate: Fri Dec 31 19:41:14 2021 +
Commit: Caolán McNamara 
CommitDate: Sat Jan 1 17:58:38 2022 +0100

fix solenv/gbuild/extensions/post_Fuzzers.mk:11: *** missing separator

since...

commit c859b4aa48956cbf5ff41280b0008456e8f5189c
Date:   Fri Dec 31 09:11:10 2021 +0100

gbuild: introduce gb_%_linktarget_target

Just some refactoring.

I also think gb_Executable_linktarget_target should be
gb_Executable_get_linktarget_target.

Change-Id: I270fe10ca7d12c454ce69744815a2e35a909a851
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127819
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/solenv/gbuild/extensions/post_Fuzzers.mk 
b/solenv/gbuild/extensions/post_Fuzzers.mk
index fb3ddf38c4b6..e26e65935567 100644
--- a/solenv/gbuild/extensions/post_Fuzzers.mk
+++ b/solenv/gbuild/extensions/post_Fuzzers.mk
@@ -11,7 +11,7 @@
 $(foreach fuzzer,$(gb_Fuzzers_KNOWN), \
 $(eval gb_Fuzzers_KNOWN = $(filter-out $(fuzzer),$(gb_Fuzzers_KNOWN))) \
 $(if $(firstword $(gb_Fuzzers_KNOWN)), \
-$(eval $(call gb_Executable_get_linktarget_target,$(firstword 
$(gb_Fuzzers_KNOWN : \
-$(call gb_Executable_linktarget_target,$(fuzzer
+$(eval $(call gb_Executable_get_linktarget_target,$(firstword 
$(gb_Fuzzers_KNOWN))) : \
+$(call gb_Executable_get_linktarget_target,$(fuzzer)
 
 # vim: set noet sw=4 ts=4:

[Libreoffice-commits] core.git: solenv/gbuild

[Jan-Marek Glogowski (via logerrit)]

 solenv/gbuild/LinkTarget.mk |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 42834bec6ba590f060e74c23324d362bf8d4fd1a
Author: Jan-Marek Glogowski 
AuthorDate: Fri Dec 31 09:11:10 2021 +0100
Commit: Jan-Marek Glogowski 
CommitDate: Sat Jan 1 11:47:55 2022 +0100

oss-fuzz: depend on linktarget, not the binary

Not really an oss-fuzz-only problem, but general linking of static
binaries.

Broken in commit ecc50f56b3282ec3b0364101d860f22fe8da9042
("gbuild: set library dependency for static builds").

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

diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 7741da69c2b3..7f72ab131ac8 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -1234,7 +1234,7 @@ else # DISABLE_DYNLOADING
 # depend on the now-static libraries themself, but only if the target actually 
links to it
 ifneq (,$(call gb_LinkTarget_does_real_link,$(1)))
 $(foreach lib,$(3),$(if $(filter $(lib),$(gb_Library_KNOWNLIBS)), \
-$(eval $(call gb_LinkTarget_get_target,$(1)) : $(call 
gb_Library_get_target,$(lib))) \
+$(eval $(call gb_LinkTarget_get_target,$(1)) : $(call 
gb_Library_get_linktarget_target,$(lib))) \
 ))
 endif
 endif # DISABLE_DYNLOADING
@@ -1330,7 +1330,7 @@ ifneq (,$(call gb_LinkTarget_does_real_link,$(1)))
 # make has a size limit for the prerequisites string, which will be exceeded 
for some larger static links,
 # like soffice.bin, but there seems to be no limit for makefile lines...
 $(foreach lib,$(2), \
-$$(eval $(call gb_LinkTarget_get_target,$(1)): $(call 
gb_StaticLibrary_get_target,$(lib
+$$(eval $(call gb_LinkTarget_get_target,$(1)): $(call 
gb_StaticLibrary_get_linktarget_target,$(lib
 endif
 $(call gb_LinkTarget_get_headers_target,$(1)) : \
$(foreach lib,$(2),$(call gb_StaticLibrary_get_headers_target,$(lib)))

[Libreoffice-commits] core.git: solenv/gbuild

[Jan-Marek Glogowski (via logerrit)]

 solenv/gbuild/Helper.mk  |1 +
 solenv/gbuild/extensions/post_Fuzzers.mk |   17 +
 solenv/gbuild/platform/unxgcc.mk |5 +++--
 3 files changed, 21 insertions(+), 2 deletions(-)

New commits:
commit 6979fec4c1d0d0c4c99bbf58aa4fd7d0f2be42f4
Author: Jan-Marek Glogowski 
AuthorDate: Wed Dec 29 17:16:16 2021 +0100
Commit: Jan-Marek Glogowski 
CommitDate: Thu Dec 30 00:04:28 2021 +0100

oss-fuzz: chain-depend all *fuzzer binaries

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

diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk
index 9f3e92e02ec4..a146de70d748 100644
--- a/solenv/gbuild/Helper.mk
+++ b/solenv/gbuild/Helper.mk
@@ -116,6 +116,7 @@ define gb_Helper_collect_knownlibs
 gb_Library_KNOWNLIBS := $$(foreach 
group,$$(gb_Library_VALIDGROUPS),$$(gb_Library_$$(group)))
 gb_Executable_KNOWN := $$(foreach 
group,$$(gb_Executable_VALIDGROUPS),$$(gb_Executable_$$(group)))
 gb_Jar_KNOWN := $$(foreach group,$$(gb_Jar_VALIDGROUPS),$$(gb_Jar_$$(group)))
+gb_Fuzzers_KNOWN := $$(filter %fuzzer,$$(foreach 
group,$$(gb_Executable_VALIDGROUPS),$$(gb_Executable_$$(group
 
 endef
 
diff --git a/solenv/gbuild/extensions/post_Fuzzers.mk 
b/solenv/gbuild/extensions/post_Fuzzers.mk
new file mode 100644
index ..06d7a94e990e
--- /dev/null
+++ b/solenv/gbuild/extensions/post_Fuzzers.mk
@@ -0,0 +1,17 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+# chain-link all fuzzer binaries
+$(foreach fuzzer,$(gb_Fuzzers_KNOWN), \
+$(eval gb_Fuzzers_KNOWN = $(filter-out $(fuzzer),$(gb_Fuzzers_KNOWN))) \
+$(if $(firstword $(gb_Fuzzers_KNOWN)), \
+$(eval $(call gb_LinkTarget_get_target,$(call 
gb_Executable_get_linktarget,$(firstword $(gb_Fuzzers_KNOWN : \
+$(call gb_LinkTarget_get_target,$(call 
gb_Executable_get_linktarget,$(fuzzer))
+
+# vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index 94402183eb02..3a7aba87a760 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -107,7 +107,7 @@ define gb_LinkTarget__WantLock
 $(if $(strip $(and \
 $(call gb_CondBuildLockfile,$(true)), \
 $(filter-out Executable/lockfile,$(1)), \
-$(DISABLE_DYNLOADING), \
+$(if $(filter FUZZERS,$(BUILD_TYPE)),,$(DISABLE_DYNLOADING)), \
 $(filter CppunitTest Executable,$(TARGETTYPE)) \
 )),$(true))
 endef
@@ -123,8 +123,9 @@ gb_LinkTarget__NeedsCxxLinker = $(if 
$(CXXOBJECTS)$(GENCXXOBJECTS)$(EXTRAOBJECTL
 # contains .c sources:
 define gb_LinkTarget__command_dynamiclink
 $(if $(call gb_LinkTarget__WantLock,$2), \
+   echo "$(call gb_Output_announce_str,$(2): wait for lock at $$(date 
-u),$(true),LNK,5)" ; \
$(gb_LinkTarget__cmd_lockfile) -r -1 $(gb_LinkTarget__Lock) ;  \
-   echo "$(call gb_Output_announce_str,$(2): got link lock at $$(date 
-u),$(true),LNK,5)" \
+   echo "$(call gb_Output_announce_str,$(2): got link lock at $$(date 
-u),$(true),LNK,5)" ; \
 )
 $(call gb_Helper_abbreviate_dirs,\
$(if $(call gb_LinkTarget__NeedsCxxLinker),$(or $(T_CXX),$(gb_CXX)) 
$(gb_CXX_LINKFLAGS),$(or $(T_CC),$(gb_CC))) \

[Libreoffice-commits] core.git: solenv/gbuild

[Jan-Marek Glogowski (via logerrit)]

 solenv/gbuild/Output.mk  |7 +--
 solenv/gbuild/platform/unxgcc.mk |5 -
 2 files changed, 9 insertions(+), 3 deletions(-)

New commits:
commit 9e8c1da64fa8a520730ce0aea0f7199cd75c892f
Author: Jan-Marek Glogowski 
AuthorDate: Mon Dec 27 21:31:38 2021 +0100
Commit: Jan-Marek Glogowski 
CommitDate: Tue Dec 28 00:00:01 2021 +0100

gbuild: announce date when acquiring the link lock

Must use echo, because we're in the shell at this point.

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

diff --git a/solenv/gbuild/Output.mk b/solenv/gbuild/Output.mk
index 4fbefdea57a7..4e3b5b92ef22 100644
--- a/solenv/gbuild/Output.mk
+++ b/solenv/gbuild/Output.mk
@@ -146,9 +146,12 @@ $(info $(gb_Output_BELL)$(gb_Output_ESCAPE)[A)
 endef
 endif
 
-define gb_Output_announce
-$(info $(call gb_Output__format_type,$(2),$(3),$(4)) $(call 
gb_Output__format_target,$(1)))
+define gb_Output_announce_str
+$(call gb_Output__format_type,$(2),$(3),$(4)) $(call 
gb_Output__format_target,$(1))
 endef
 
+define gb_Output_announce
+$(info $(call gb_Output_announce_str,$(1),$(2),$(3),$(4)))
+endef
 
 # vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index 2aba54f2bca1..94402183eb02 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -122,7 +122,10 @@ gb_LinkTarget__NeedsCxxLinker = $(if 
$(CXXOBJECTS)$(GENCXXOBJECTS)$(EXTRAOBJECTL
 # libclang_rt.ubsan_cxx-x86_64.a, and oosplash links against sal but itself 
only
 # contains .c sources:
 define gb_LinkTarget__command_dynamiclink
-$(if $(call gb_LinkTarget__WantLock,$2),$(gb_LinkTarget__cmd_lockfile) -r -1 
$(gb_LinkTarget__Lock))
+$(if $(call gb_LinkTarget__WantLock,$2), \
+   $(gb_LinkTarget__cmd_lockfile) -r -1 $(gb_LinkTarget__Lock) ;  \
+   echo "$(call gb_Output_announce_str,$(2): got link lock at $$(date 
-u),$(true),LNK,5)" \
+)
 $(call gb_Helper_abbreviate_dirs,\
$(if $(call gb_LinkTarget__NeedsCxxLinker),$(or $(T_CXX),$(gb_CXX)) 
$(gb_CXX_LINKFLAGS),$(or $(T_CC),$(gb_CC))) \
$(if $(filter Library 
CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \

[Libreoffice-commits] core.git: solenv/gbuild

[Jan-Marek Glogowski (via logerrit)]

 solenv/gbuild/LinkTarget.mk  |   26 ++
 solenv/gbuild/TargetLocations.mk |4 
 2 files changed, 26 insertions(+), 4 deletions(-)

New commits:
commit ecc50f56b3282ec3b0364101d860f22fe8da9042
Author: Jan-Marek Glogowski 
AuthorDate: Tue Dec 21 04:36:55 2021 +0100
Commit: Jan-Marek Glogowski 
CommitDate: Fri Dec 24 02:17:37 2021 +0100

gbuild: set library dependency for static builds

For DISABLE_DYNLOADING builds, all libraries become real and not
export-only dependencies. And all real linking targets need a
dependency on all static libraries.

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

diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 57b9a40d7560..12c4dec988fa 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -1197,6 +1197,11 @@ define gb_PrintDeps_info
 $(info LibraryDep: $(1) links against $(2))
 endef
 
+# returns $(true), if the target class really calls a linker.
+# call gb_LinkTarget_does_real_link,linktarget
+gb_LinkTarget_does_real_link = $(if $(filter Executable CppunitTest $(if 
$(DISABLE_DYNLOADING),,Library), \
+$(call gb_LinkTarget__get_workdir_linktargetclass,$(1))),$(true))
+
 # avoid problem when a module is built partially but other modules that define
 # needed libraries is not yet built: prevent invocation of pattern rule
 # for library with invalid parameters by depending on the header target
@@ -1218,12 +1223,21 @@ endif
 
 $(call gb_LinkTarget_get_target,$(1)) : LINKED_LIBS += $(3)
 
+ifeq (,$(DISABLE_DYNLOADING))
 # depend on the exports of the library, not on the library itself
-# for faster incremental builds when the ABI is unchanged
-ifeq ($(DISABLE_DYNLOADING),)
+# for faster incremental builds when the ABI is unchanged.
+# export files are created from the library, so this also ensures the library 
exists.
 $(call gb_LinkTarget_get_target,$(1)) : \
$(foreach lib,$(3),$(call gb_Library_get_exports_target,$(lib)))
+
+else # DISABLE_DYNLOADING
+# depend on the now-static libraries themself, but only if the target actually 
links to it
+ifneq (,$(call gb_LinkTarget_does_real_link,$(1)))
+$(foreach lib,$(3),$(if $(filter $(lib),$(gb_Library_KNOWNLIBS)), \
+$(eval $(call gb_LinkTarget_get_target,$(1)) : $(call 
gb_Library_get_target,$(lib))) \
+))
 endif
+endif # DISABLE_DYNLOADING
 
 $(call gb_LinkTarget_get_headers_target,$(1)) : \
$(foreach lib,$(2),$(call gb_Library_get_headers_target,$(lib)))
@@ -1311,8 +1325,12 @@ $(if $(call gb_LinkTarget__is_merged,$(1)),\
$(call gb_LinkTarget_get_target,$(call 
gb_Library_get_linktarget,merged)) : \
LINKED_STATIC_LIBS += $$(if $$(filter-out 
StaticLibrary,$$(TARGETTYPE)),$(2)))
 
-ifeq ($(DISABLE_DYNLOADING),)
-$(call gb_LinkTarget_get_target,$(1)) : $(foreach lib,$(2),$(call 
gb_StaticLibrary_get_target,$(lib)))
+# depend on the static libraries, but only if the target actually links to it
+ifneq (,$(call gb_LinkTarget_does_real_link,$(1)))
+# make has a size limit for the prerequisites string, which will be exceeded 
for some larger static links,
+# like soffice.bin, but there seems to be no limit for makefile lines...
+$(foreach lib,$(2), \
+$$(eval $(call gb_LinkTarget_get_target,$(1)): $(call 
gb_StaticLibrary_get_target,$(lib
 endif
 $(call gb_LinkTarget_get_headers_target,$(1)) : \
$(foreach lib,$(2),$(call gb_StaticLibrary_get_headers_target,$(lib)))
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index 24e1210b2563..d2bbfe0cdfb2 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -114,7 +114,11 @@ gb_JunitTest_get_classsetname = JunitTest/$(1)
 gb_JunitTest_get_target = $(WORKDIR)/JunitTest/$(1)/done
 gb_JunitTest_get_userdir = $(WORKDIR)/JunitTest/$(1)/user
 gb_PythonTest_get_target = $(WORKDIR)/PythonTest/$(1)/done
+# linktarget = class/object<>some_optional_target, like 
Library/libswlo.so<>/.../instdir/program/libswlo.so
+# while the target is optional, the workdir functions will always work 
correctly
 gb_LinkTarget__get_workdir_linktargetname = $(firstword $(subst <>,  ,$(1)))
+gb_LinkTarget__get_workdir_linktargetclass =  $(firstword $(subst /,  ,$(call 
gb_LinkTarget__get_workdir_linktargetname,$(1
+gb_LinkTarget__get_workdir_linktargetobject = $(lastword $(subst /,  ,$(call 
gb_LinkTarget__get_workdir_linktargetname,$(1
 gb_LinkTarget_get_headers_target = \
  $(WORKDIR)/Headers/$(call gb_LinkTarget__get_workdir_linktargetname,$(1))
 gb_LinkTarget_get_objects_list = \

[Libreoffice-commits] core.git: solenv/gbuild solenv/inc

[Christian Lohmaier (via logerrit)]

 solenv/gbuild/extensions/pre_SharedLangList.mk |   54 -
 solenv/gbuild/gbuild.mk|2 
 solenv/inc/langlist.mk |   33 +++
 3 files changed, 35 insertions(+), 54 deletions(-)

New commits:
commit 4cae99b99e9853c5b1e64dac1926ecd718982409
Author: Christian Lohmaier 
AuthorDate: Wed Dec 22 17:48:11 2021 +0100
Commit: Christian Lohmaier 
CommitDate: Wed Dec 22 23:06:41 2021 +0100

janitorial: the lang definitions aren't really an optional part of gbuild

furthermore there's no need to keep them separate to fit dmake anymore,
so lump together what goes together...

Change-Id: Ic0377a322100c20352e211e53a670a9b0b227ab4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127332
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/solenv/gbuild/extensions/pre_SharedLangList.mk 
b/solenv/gbuild/extensions/pre_SharedLangList.mk
deleted file mode 100644
index 3c9c3c725a46..
--- a/solenv/gbuild/extensions/pre_SharedLangList.mk
+++ /dev/null
@@ -1,54 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-#   Licensed to the Apache Software Foundation (ASF) under one or more
-#   contributor license agreements. See the NOTICE file distributed
-#   with this work for additional information regarding copyright
-#   ownership. The ASF licenses this file to you under the Apache
-#   License, Version 2.0 (the "License"); you may not use this file
-#   except in compliance with the License. You may obtain a copy of
-#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-
-# share language list with dmake build system
-include $(SRCDIR)/solenv/inc/langlist.mk
-
-ifneq ($(WITH_LANG),ALL)
-gb_WITH_LANG=$(WITH_LANG)
-else
-# expand ALL based on language list)
-gb_WITH_LANG=$(completelangiso)
-endif
-gb_HELP_LANGS := en-US
-
-ifneq ($(ENABLE_RELEASE_BUILD),TRUE)
-ifneq ($(WITH_LANG),)
-gb_WITH_LANG += qtz
-gb_HELP_LANGS += qtz
-endif
-endif
-
-gb_TRANS_LANGS = $(filter-out en-US,$(filter-out qtz,$(gb_WITH_LANG)))
-
-gb_HELP_LANGS += \
-   $(foreach lang,$(filter-out 
$(WITH_POOR_HELP_LOCALIZATIONS),$(gb_TRANS_LANGS)),\
-   $(if \
-   $(and \
-   $(wildcard 
$(SRCDIR)/helpcontent2/source/auxiliary/$(lang)),\
-   $(wildcard 
$(SRCDIR)/translations/source/$(lang)/helpcontent2)),\
-   $(lang)))
-
-# Langs that need special handling for registry files. This is done by
-# MAKE_LANG_SPECIFIC flag in scp.
-gb_CJK_LANGS := $(filter $(gb_WITH_LANG),ja ko zh-CN zh-TW)
-gb_CTL_LANGS := $(filter $(gb_WITH_LANG),ar bo dz fa gu he hi km ky-CN lo my 
ne or pa-IN ta th)
-gb_CTLSEQCHECK_LANGS := $(filter $(gb_CTL_LANGS),km lo th)
-
-# vim: set noet ts=4 sw=4:
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index e2c6b9aee6a2..5f8dacfae841 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -70,6 +70,8 @@ include $(GBUILDDIR)/Helper.mk
 
 include $(GBUILDDIR)/Conditions.mk
 
+include $(SRCDIR)/solenv/inc/langlist.mk
+
 # optional extensions that should never be essential
 ifneq ($(wildcard $(GBUILDDIR)/extensions/pre_*.mk),)
 include $(wildcard $(GBUILDDIR)/extensions/pre_*.mk)
diff --git a/solenv/inc/langlist.mk b/solenv/inc/langlist.mk
index 54e2666fc8a9..bae4c50434c8 100644
--- a/solenv/inc/langlist.mk
+++ b/solenv/inc/langlist.mk
@@ -136,3 +136,36 @@ xh \
 zh-CN \
 zh-TW \
 zu
+
+ifneq ($(WITH_LANG),ALL)
+gb_WITH_LANG=$(WITH_LANG)
+else
+# expand ALL based on language list)
+gb_WITH_LANG=$(completelangiso)
+endif
+gb_HELP_LANGS := en-US
+
+ifneq ($(ENABLE_RELEASE_BUILD),TRUE)
+ifneq ($(WITH_LANG),)
+gb_WITH_LANG += qtz
+gb_HELP_LANGS += qtz
+endif
+endif
+
+gb_TRANS_LANGS = $(filter-out en-US,$(filter-out qtz,$(gb_WITH_LANG)))
+
+gb_HELP_LANGS += \
+   $(foreach lang,$(filter-out 
$(WITH_POOR_HELP_LOCALIZATIONS),$(gb_TRANS_LANGS)),\
+   $(if \
+   $(and \
+   $(wildcard 
$(SRCDIR)/helpcontent2/source/auxiliary/$(lang)),\
+   $(wildcard 
$(SRCDIR)/translations/source/$(lang)/helpcontent2)),\
+   $(lang)))
+
+# Langs that need special handling for registry files. This is done by
+# MAKE_LANG_SPECIFIC flag in scp.
+gb_CJK_LANGS := $(filter $(gb_WITH_LANG),ja ko zh-CN zh-TW)
+gb_CTL_LANGS := $(filter $(gb_WITH_LANG),ar bo dz fa gu he hi km ky-CN lo my 
ne or pa-IN ta th)
+gb_CTLSEQCHECK_LANGS := $(filter $(gb_CTL_LANGS),km lo th)
+
+# vim: set noet ts=4 sw=4:

[Libreoffice-commits] core.git: solenv/gbuild

[Stephan Bergmann (via logerrit)]

 solenv/gbuild/Module.mk  |   41 +--
 solenv/gbuild/TargetLocations.mk |1 
 solenv/gbuild/gbuild.help.txt|2 -
 3 files changed, 2 insertions(+), 42 deletions(-)

New commits:
commit daa8e90fc919dd8150c819e342b3f96739d94ca2
Author: Stephan Bergmann 
AuthorDate: Mon Dec 13 15:59:30 2021 +0100
Commit: Stephan Bergmann 
CommitDate: Tue Dec 14 07:37:14 2021 +0100

Revert "add stagingcheck target for unstable/failing tests"

This reverts commit c1f47481eb78df3d73bed1da5020ed6ea565a999.
Conflicts:
solenv/gbuild/Module.mk
solenv/gbuild/gbuild.help.txt

It has apparently never been used.

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

diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk
index fcedbc95f248..bb915f5034cb 100644
--- a/solenv/gbuild/Module.mk
+++ b/solenv/gbuild/Module.mk
@@ -49,7 +49,6 @@ gb_Module_CHECKTARGETSTACK :=
 gb_Module_SLOWCHECKTARGETSTACK :=
 gb_Module_SCREENSHOTTARGETSTACK :=
 gb_Module_SUBSEQUENTCHECKTARGETSTACK :=
-gb_Module_STAGINGCHECKTARGETSTACK :=
 gb_Module_PERFCHECKTARGETSTACK :=
 gb_Module_UICHECKTARGETSTACK :=
 gb_Module_CLEANTARGETSTACK :=
@@ -116,14 +115,6 @@ $(call gb_Module_get_subsequentcheck_target,%) :
mkdir -p $(dir $@) && \
touch $@)
 
-$(call gb_Module_get_stagingcheck_target,%) :
-   $(call gb_Output_announce,$*,$(true),STC,5)
-   $(call gb_Trace_MakeMark,$*,STC)
-   $(call gb_Output_announce_title,module $* stagingchecks done.)
-   -$(call gb_Helper_abbreviate_dirs,\
-   mkdir -p $(dir $@) && \
-   touch $@)
-
 $(call gb_Module_get_perfcheck_target,%) :
$(call gb_Output_announce,$*,$(true),PFC,5)
$(call gb_Trace_MakeMark,$*,PFC)
@@ -148,7 +139,7 @@ $(call gb_Module_get_target,%) :
mkdir -p $(dir $@) && \
touch $@)
 
-.PHONY : build build-l10n-only build-non-l10n-only unitcheck slowcheck 
screenshot subsequentcheck stagingcheck perfcheck uicheck clean check debugrun 
help showmodules translations
+.PHONY : build build-l10n-only build-non-l10n-only unitcheck slowcheck 
screenshot subsequentcheck perfcheck uicheck clean check debugrun help 
showmodules translations
 .DEFAULT_GOAL := build
 
 ifeq ($(gb_Side),build)
@@ -202,11 +193,6 @@ subsequentcheck :
$(call gb_Output_announce_title,all subsequent tests checked.)
$(call gb_Output_announce_bell)
 
-stagingcheck :
-   $(if $(gb_VERBOSE),$(call gb_Output_announce,loaded modules: $(sort 
$(gb_Module_ALLMODULES)),$(true),STC,6))
-   $(call gb_Output_announce_title,all staging tests checked.)
-   $(call gb_Output_announce_bell)
-
 perfcheck :
$(if $(gb_VERBOSE),$(call gb_Output_announce,loaded modules: $(sort 
$(gb_Module_ALLMODULES)),$(true),PFC,6))
$(call gb_Output_announce_title,all perftests checked.)
@@ -271,7 +257,6 @@ gb_Module_SLOWCHECKTARGETSTACK := $(call 
gb_Module_get_slowcheck_target,$(1)) $(
 gb_Module_SCREENSHOTTARGETSTACK := $(call 
gb_Module_get_screenshot_target,$(1)) $(gb_Module_SCREENSHOTTARGETSTACK)
 gb_Module_UICHECKTARGETSTACK := $(call gb_Module_get_uicheck_target,$(1)) 
$(gb_Module_UICHECKTARGETSTACK)
 gb_Module_SUBSEQUENTCHECKTARGETSTACK := $(call 
gb_Module_get_subsequentcheck_target,$(1)) 
$(gb_Module_SUBSEQUENTCHECKTARGETSTACK)
-gb_Module_STAGINGCHECKTARGETSTACK := $(call 
gb_Module_get_stagingcheck_target,$(1)) $(gb_Module_STAGINGCHECKTARGETSTACK)
 gb_Module_PERFCHECKTARGETSTACK := $(call gb_Module_get_perfcheck_target,$(1)) 
$(gb_Module_PERFCHECKTARGETSTACK)
 gb_Module_CLEANTARGETSTACK := $(call gb_Module_get_clean_target,$(1)) 
$(gb_Module_CLEANTARGETSTACK)
 gb_Module_CURRENTMODULE_SYMBOLS_ENABLED := $(call 
gb_Module__symbols_enabled,$(1),$(notdir $(realpath $(dir $(realpath $(lastword 
$(MAKEFILE_LIST../)))
@@ -367,19 +352,6 @@ $(call gb_Module_get_clean_target,$(1)) : 
$$(gb_Module_CURRENTCLEANTARGET)
 
 endef
 
-define gb_Module_add_stagingcheck_target
-$(info adding stagingcheck $(1) $(2))
-$(call gb_Module__read_targetfile,$(1),$(2),stagingcheck target)
-
-$(call gb_Module_get_stagingcheck_target,$(1)) : $$(gb_Module_CURRENTTARGET)
-$$(gb_Module_CURRENTTARGET) :| \
-   $(call gb_Postprocess_get_target,AllModulesButInstsetNative) \
-$(call gb_Package_get_target,instsetoo_native_setup) \
-$(call gb_Package_get_target,instsetoo_native_setup_ure)
-$(call gb_Module_get_clean_target,$(1)) : $$(gb_Module_CURRENTCLEANTARGET)
-
-endef
-
 define gb_Module_add_perfcheck_target
 $(call gb_Module__read_targetfile,$(1),$(2),perfcheck target)
 
@@ -414,7 +386,6 @@ $(call gb_Module_get_check_target,$(1)) : $$(firstword 
$$(gb_Module_CHECKTARGETS
 $(call gb_Module_get_slowcheck_target,$(1)) : $$(firstword 
$$(gb_Module_SLOWCHECKTARGETSTACK))
 $(call 

[Libreoffice-commits] core.git: solenv/gbuild

[Jan-Marek Glogowski (via logerrit)]

 solenv/gbuild/Library.mk|2 +-
 solenv/gbuild/LinkTarget.mk |4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 186a275ffb1309fac9c4ef36d5b3126f0350760f
Author: Jan-Marek Glogowski 
AuthorDate: Mon Dec 13 12:10:43 2021 +0100
Commit: Jan-Marek Glogowski 
CommitDate: Mon Dec 13 16:50:18 2021 +0100

gbuild: forward / set linktargetmakefilename

Unfortunatly RepositoryExternal.mk ais generally not forwarding
this info. It's also not really documented.

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

diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk
index 6dc2b9591104..df42c047f846 100644
--- a/solenv/gbuild/Library.mk
+++ b/solenv/gbuild/Library.mk
@@ -192,7 +192,7 @@ endif
 
 $(call gb_LinkTarget_get_target,$(call gb_Library_get_linktarget,$(2))) : 
PLUGINS += $(1)
 $(eval $(call gb_LinkTarget__add_plugin,$(call 
gb_Library_get_linktarget,$(2)),$(1)))
-$(eval $(call gb_LinkTarget__set_plugin_for,$(call 
gb_Library_get_linktarget,$(1)),$(2),$(3)))
+$(eval $(call gb_LinkTarget__set_plugin_for,$(call 
gb_Library_get_linktarget,$(1)),$(2),$(3),Library_$(1)))
 endef
 
 # call gb_Library_set_plugin_for_nodep,library,loader
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index fa71771b6582..57b9a40d7560 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -2073,7 +2073,7 @@ endef
 
 # call gb_LinkTarget_use_glxtest,linktarget,add_libs
 define gb_LinkTarget_use_glxtest
-$(call gb_LinkTarget_use_libraries,$(1),vcl)
+$(call gb_LinkTarget_use_libraries,$(1),vcl,,$(4))
 
 ifeq (,$(DISABLE_DYNLOADING))
 $(call gb_LinkTarget_add_libs,$(1),$(DLOPEN_LIBS))
@@ -2134,7 +2134,7 @@ ifeq ($(call gb_LinkTarget__is_build_tool,$(1)),$(true))
 $$(eval $$(call gb_Output_error,Plugin support for build tools not 
implemented))
 endif
 
-$(if $(3),,$(call gb_LinkTarget_use_libraries,$(1),$(2)))
+$(if $(3),,$(call gb_LinkTarget_use_libraries,$(1),$(2),,$(4)))
 
 endef
 

[Libreoffice-commits] core.git: solenv/gbuild

[Jan-Marek Glogowski (via logerrit)]

 solenv/gbuild/extensions/pre_MergedLibsList.mk |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 67763e3c45ff3a1f9df8edecf16c691ff8a053bd
Author: Jan-Marek Glogowski 
AuthorDate: Mon Dec 13 14:17:32 2021 +0100
Commit: Jan-Marek Glogowski 
CommitDate: Mon Dec 13 16:38:16 2021 +0100

Drop desktop_detector from mergelibs

Jenkins lo_callgrind_linux job failed with:

.../vcl/Library_desktop_detector.mk:22: \
   *** Plugins can't be in mergelibs.  Stop.

Regression from commit b2882faf43ea1fa473621d0378c5d87ae3b3d5a2
("desktop_detector is also a vcl plugin").

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

diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk 
b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index 12fd14edf522..ab4c3089945a 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -27,7 +27,6 @@ MERGE_LIBRARY_LIST := \
deployment \
deploymentmisc \
$(if $(filter-out MACOSX WNT,$(OS)),desktopbe1) \
-   $(if $(USING_X11),desktop_detector) \
$(if $(filter WNT,$(OS)),directx9canvas) \
drawinglayer \
editeng \

[Libreoffice-commits] core.git: solenv/gbuild

[Stephan Bergmann (via logerrit)]

 solenv/gbuild/platform/LINUX_AARCH64_GCC.mk |2 --
 1 file changed, 2 deletions(-)

New commits:
commit f3031ebe98e09d5cebed89ab33480a8e129a02cc
Author: Stephan Bergmann 
AuthorDate: Mon Dec 13 11:20:28 2021 +0100
Commit: Stephan Bergmann 
CommitDate: Mon Dec 13 14:10:44 2021 +0100

Use default gb_COMPILEROPTFLAGS -O2 for LINUX_AARCH64_GCC

235fa0334e0b45c736b636ba1689e2f8c7458697 "Linux AArch64 port" had presumably
cargo-culted the -Os value (under the name gb_COMPILERDEFAULTOPTFLAGS back 
then)
from some other file like solenv/gbuild/platform/LINUX_ARM_GCC.mk, but for 
no
apparent reason.  Lets rather use the -O2 default value, as on other 64-bit
architectures like LINUX_X86_64_GCC.

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

diff --git a/solenv/gbuild/platform/LINUX_AARCH64_GCC.mk 
b/solenv/gbuild/platform/LINUX_AARCH64_GCC.mk
index 0531389e828d..431485a7c45d 100644
--- a/solenv/gbuild/platform/LINUX_AARCH64_GCC.mk
+++ b/solenv/gbuild/platform/LINUX_AARCH64_GCC.mk
@@ -7,8 +7,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-gb_COMPILEROPTFLAGS := -Os
-
 include $(GBUILDDIR)/platform/linux.mk
 
 # vim: set noet sw=4:

[Libreoffice-commits] core.git: solenv/gbuild

[Jan-Marek Glogowski (via logerrit)]

 solenv/gbuild/platform/unxgcc.mk |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 8368f48df8d67f6c712534647f4d375bf219ae99
Author: Jan-Marek Glogowski 
AuthorDate: Mon Dec 6 12:06:08 2021 +0100
Commit: Jan-Marek Glogowski 
CommitDate: Mon Dec 6 13:52:26 2021 +0100

Limit static system library linking to fuzzers

When building a static LO on Linux, I get a lost of missing
symbols for binaries, like oosplash. In that case we just link to
Xinerama, but this has obviously other X11-based dependencies,
and there is no real way to fix this.

According to caolan, this was just added in commit
7a3eaef6dd707781c2f4e341aebb9d4c42df780f ("for DISABLE_DYNLOADING
support linking to static .a system libs") to support instrumented
static libraries used for the oss-fuzz runs (see
https://github.com/google/oss-fuzz/issues/608).

So actually limit these flags for FUZZERS only.

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

diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index 60e63f36cd3a..a7631f4446a3 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -129,11 +129,11 @@ $(call gb_Helper_abbreviate_dirs,\
$(foreach extraobjectlist,$(EXTRAOBJECTLISTS),`cat 
$(extraobjectlist)`) \
$(if $(filter TRUE,$(DISABLE_DYNLOADING)), \
-Wl$(COMMA)--start-group \
-   -Wl$(COMMA)-Bstatic \
+   $(call gb_Helper_optional,FUZZERS,-Wl$(COMMA)-Bstatic) \
$(patsubst lib%.a,-l%,$(patsubst lib%.so,-l%,$(patsubst 
%.$(gb_Library_UDK_MAJORVER),%,$(foreach lib,$(LINKED_LIBS),$(call 
gb_Library_get_filename,$(lib)) \
$(foreach lib,$(LINKED_STATIC_LIBS),$(call 
gb_StaticLibrary_get_target,$(lib))) \
$(T_LIBS) \
-   -Wl$(COMMA)-Bdynamic \
+   $(call gb_Helper_optional,FUZZERS,-Wl$(COMMA)-Bdynamic) \
$(if 
$(CXXOBJECTS)$(GENCXXOBJECTS)$(EXTRAOBJECTLISTS)$(filter-out 
XTRUE,X$(ENABLE_RUNTIME_OPTIMIZATIONS)),$(T_STDLIBS_CXX)) \
-Wl$(COMMA)--end-group \
, \

[Libreoffice-commits] core.git: solenv/gbuild

[Jan-Marek Glogowski (via logerrit)]

 solenv/gbuild/LinkTarget.mk |6 +-
 1 file changed, 1 insertion(+), 5 deletions(-)

New commits:
commit 47b088e2c7917762f96c44346931cc40d56b2efa
Author: Jan-Marek Glogowski 
AuthorDate: Fri Dec 3 04:41:12 2021 +0100
Commit: Jan-Marek Glogowski 
CommitDate: Fri Dec 3 13:56:35 2021 +0100

Fix --enable-mergelibs plugin dependency

Not sure why I didn't use gb_LinkTarget_use_libraries instead of
the internal version.

Regression from commit ed583bf8d553b145f83b66118253aaf7ac94fa1a
("gbuild: introduce plugin + loader concepts").

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

diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 3b02bb635400..278664571d8e 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -2125,10 +2125,6 @@ endef
 #
 # call gb_LinkTarget__set_plugin_for,linktarget,loader,nodep
 define gb_LinkTarget__set_plugin_for
-ifneq (,$$(filter-out $(gb_Library_KNOWNLIBS),$(2)))
-$$(eval $$(call gb_Output_info,currently known libraries are: $(sort 
$(gb_Library_KNOWNLIBS)),ALL))
-$$(eval $$(call gb_Output_error,Cannot link against library/libraries 
$$(filter-out $(gb_Library_KNOWNLIBS),$(2)). Libraries must be registered in 
Repository.mk or RepositoryExternal.mk))
-endif
 ifeq (,$(filter $(1),$(foreach plugin,$(gb_Library_KNOWNPLUGINS),$(call 
gb_Library_get_linktarget,$(plugin)
 $$(eval $$(call gb_Output_error,Unknown plugin(s) '$(filter $(1),$(foreach 
plugin,$(gb_Library_KNOWNPLUGINS),$(call 
gb_Library_get_linktarget,$(plugin'. Plugins must be registered in 
Repository.mk or RepositoryExternal.mk))
 endif
@@ -2139,7 +2135,7 @@ ifeq ($(call gb_LinkTarget__is_build_tool,$(1)),$(true))
 $$(eval $$(call gb_Output_error,Plugin support for build tools not 
implemented))
 endif
 
-$(if $(3),,$(call gb_LinkTarget__use_libraries,$(1),$(2),$(2)))
+$(if $(3),,$(call gb_LinkTarget_use_libraries,$(1),$(2)))
 
 endef
 

[Libreoffice-commits] core.git: solenv/gbuild

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

 solenv/gbuild/platform/com_MSC_class.mk |4 ++--
 solenv/gbuild/platform/com_MSC_defs.mk  |1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 9425ea3f8f5622e857dc1e860b151fd94323de0c
Author: Luboš Luňák 
AuthorDate: Tue Nov 30 22:19:19 2021 +0100
Commit: Luboš Luňák 
CommitDate: Wed Dec 1 13:37:05 2021 +0100

apparently link.exe -dump is a short for dumpbin.exe

So use the latter, in case we'll want to use lld-link, as that one
doesn't know -link.

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

diff --git a/solenv/gbuild/platform/com_MSC_class.mk 
b/solenv/gbuild/platform/com_MSC_class.mk
index 55a35f9ba661..ea866d44ec63 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -296,8 +296,8 @@ $(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 && 
\
-   $(gb_LINK) \
-   -dump -exports $(ILIBTARGET) \
+   $(gb_DUMPBIN) \
+   -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)))
 \
; \
diff --git a/solenv/gbuild/platform/com_MSC_defs.mk 
b/solenv/gbuild/platform/com_MSC_defs.mk
index 08e799033eb5..7620adab7e79 100644
--- a/solenv/gbuild/platform/com_MSC_defs.mk
+++ b/solenv/gbuild/platform/com_MSC_defs.mk
@@ -26,6 +26,7 @@ include $(GBUILDDIR)/platform/windows.mk
 gb_CC := cl
 gb_CXX := cl
 gb_LINK := link
+gb_DUMPBIN := dumpbin
 gb_AWK := awk
 gb_CLASSPATHSEP := ;
 gb_RC := rc

[Libreoffice-commits] core.git: solenv/gbuild

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

 solenv/gbuild/platform/com_MSC_class.mk |9 +
 solenv/gbuild/platform/com_MSC_defs.mk  |7 +++
 2 files changed, 16 insertions(+)

New commits:
commit da2d40bb2b0b81cb891e2a334d672bb2790a7c23
Author: Luboš Luňák 
AuthorDate: Tue Nov 30 11:22:11 2021 +0100
Commit: Luboš Luňák 
CommitDate: Tue Nov 30 15:44:49 2021 +0100

use -fno-pch-timestamp also with clang-cl

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

diff --git a/solenv/gbuild/platform/com_MSC_class.mk 
b/solenv/gbuild/platform/com_MSC_class.mk
index 2ca7466836b5..55a35f9ba661 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -116,6 +116,7 @@ $(call gb_Helper_abbreviate_dirs,\
$(if $(EXTERNAL_CODE),$(if 
$(COM_IS_CLANG),-Wno-undef),$(gb_DEFS_INTERNAL)) \
$(if $(filter YES,$(LIBRARY_X64)), ,$(gb_LTOFLAGS)) \
$(gb_COMPILERDEPFLAGS) \
+   $(gb_NO_PCH_TIMESTAMP) \
$(5) \
-c $(3) \
-Yc$(notdir $(patsubst %.cxx,%.hxx,$(3))) -I$(dir $(patsubst 
%.cxx,%.hxx,$(3))) -Fp$(1) -Fo$(1).obj) \
@@ -123,6 +124,13 @@ $(call gb_Helper_abbreviate_dirs,\
$(call gb_Trace_EndRange,$(2),PCH)
 endef
 
+ifeq ($(COM_IS_CLANG),TRUE)
+# Clang has -fno-pch-timestamp, just checksum the file for CCACHE_PCH_EXTSUM
+# $(call 
gb_PrecompiledHeader__sum_command,pchfile,pchtarget,source,cxxflags,includes,linktargetmakefilename,compiler)
+define gb_PrecompiledHeader__sum_command
+   $(SHA256SUM) $(1) >$(1).sum
+endef
+else
 # MSVC does not generate the same .pch for the same input, so checksum the 
(preprocessed) input
 # $(call 
gb_PrecompiledHeader__sum_command,pchfile,pchtarget,source,cxxflags,includes,linktargetmakefilename,compiler)
 define gb_PrecompiledHeader__sum_command
@@ -139,6 +147,7 @@ $(call gb_Helper_abbreviate_dirs,\
2>&1 | $(SHA256SUM) >$(1).sum \
)
 endef
+endif
 
 # When building a PCH, MSVC also creates a .pdb file with debug info. So for 
reuse
 # add the .pdb to the PCH's files and then use the .pdb also for linktargets 
that reuse the PCH.
diff --git a/solenv/gbuild/platform/com_MSC_defs.mk 
b/solenv/gbuild/platform/com_MSC_defs.mk
index c7f302c0b5d1..08e799033eb5 100644
--- a/solenv/gbuild/platform/com_MSC_defs.mk
+++ b/solenv/gbuild/platform/com_MSC_defs.mk
@@ -210,6 +210,13 @@ gb_LinkTarget_EXCEPTIONFLAGS := \
 
 gb_PrecompiledHeader_EXCEPTIONFLAGS := $(gb_LinkTarget_EXCEPTIONFLAGS)
 
+ifneq ($(gb_ENABLE_PCH),)
+ifeq ($(COM_IS_CLANG),TRUE)
+# the same as in com_GCC_defs.mk
+gb_NO_PCH_TIMESTAMP := -Xclang -fno-pch-timestamp
+endif
+endif
+
 gb_LinkTarget_LDFLAGS := \
$(if $(findstring s,$(filter-out --%,$(MAKEFLAGS))),-nologo,) \
$(patsubst %,-LIBPATH:%,$(filter-out .,$(subst ;, ,$(subst 
\,/,$(ILIB) \

[Libreoffice-commits] core.git: solenv/gbuild

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

 solenv/gbuild/LinkTarget.mk|3 ++-
 solenv/gbuild/PrecompiledHeaders.mk|3 ++-
 solenv/gbuild/platform/com_GCC_defs.mk |2 ++
 solenv/gbuild/platform/com_MSC_defs.mk |5 +
 4 files changed, 11 insertions(+), 2 deletions(-)

New commits:
commit b2c5944d38f107d77d647bca114fae4e940edcbf
Author: Luboš Luňák 
AuthorDate: Mon Nov 29 14:44:17 2021 +0100
Commit: Luboš Luňák 
CommitDate: Mon Nov 29 19:46:48 2021 +0100

fix shared PCH with clang-cl

clang-cl does not understand -include CLI option. It also warns
about #define's differing in the shared PCH that do not matter,
so disable that.

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

diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index b0b716ace55b..783f6022abe6 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -1938,7 +1938,8 @@ endef
 # call 
gb_LinkTarget__reuse_precompiled_header_workarounds,linktarget,pchcxxfile,pchtarget,linktargetmakefilename
 define gb_LinkTarget__reuse_precompiled_header_workarounds
 ifeq ($(COM_IS_CLANG),TRUE)
-$(call gb_LinkTarget_add_defs,$(1),-include $(SRCDIR)/pch/inc/clangfix.hxx)
+$(call 
gb_LinkTarget_add_defs,$(1),$(gb_CXXFLAGS_include)$(SRCDIR)/pch/inc/clangfix.hxx)
+$(call gb_LinkTarget_add_defs,$(1),$(gb_CXXFLAGS_no_pch_warnings))
 endif
 $(if $(filter precompiled_system,$(3)), $(call 
gb_LinkTarget_add_defs,$(1),-DBOOST_ALL_NO_LIB))
 endef
diff --git a/solenv/gbuild/PrecompiledHeaders.mk 
b/solenv/gbuild/PrecompiledHeaders.mk
index 3b81cc77f365..bc95f07b47e5 100644
--- a/solenv/gbuild/PrecompiledHeaders.mk
+++ b/solenv/gbuild/PrecompiledHeaders.mk
@@ -159,7 +159,8 @@ gb_PrecompiledHeader_ignore_flags_system := \
 -DGLM_FORCE_CTOR_INIT \
 -DVCL_INTERNALS \
 -DZLIB_CONST \
--include $(SRCDIR)/pch/inc/clangfix.hxx \
+$(gb_CXXFLAGS_include)$(SRCDIR)/pch/inc/clangfix.hxx \
+$(gb_CXXFLAGS_no_pch_warnings) \
 $(gb_PrecompiledHeader_ignore_flags_for_flags_file) \
 
 # Probably also update pch/inc/clangfix.hxx if you extend the list.
diff --git a/solenv/gbuild/platform/com_GCC_defs.mk 
b/solenv/gbuild/platform/com_GCC_defs.mk
index 589c9eedc823..e0c9dfc3d58f 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -107,6 +107,8 @@ endif
 
 gb_CXXFLAGS_Wundef = -Wno-undef
 
+gb_CXXFLAGS_include := -include$(gb_SPACE)
+
 ifeq ($(strip $(gb_GCOV)),YES)
 gb_CFLAGS_COMMON += -fprofile-arcs -ftest-coverage
 gb_CXXFLAGS_COMMON += -fprofile-arcs -ftest-coverage
diff --git a/solenv/gbuild/platform/com_MSC_defs.mk 
b/solenv/gbuild/platform/com_MSC_defs.mk
index 892fa3867ba8..c7f302c0b5d1 100644
--- a/solenv/gbuild/platform/com_MSC_defs.mk
+++ b/solenv/gbuild/platform/com_MSC_defs.mk
@@ -166,6 +166,11 @@ ifeq ($(HAVE_DLLEXPORTINLINES),TRUE)
 gb_CXXFLAGS += -Zc:dllexportInlines-
 endif
 
+gb_CXXFLAGS_include := -FI
+ifeq ($(COM_IS_CLANG),TRUE)
+gb_CXXFLAGS_no_pch_warnings := -Wno-clang-cl-pch
+endif
+
 ifneq ($(COM_IS_CLANG),TRUE)
 
 # clang-cl doesn't support -Wv:18 for now

[Libreoffice-commits] core.git: solenv/gbuild

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

 solenv/gbuild/platform/com_MSC_class.mk |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 973cf26280f80177f5e78d828ddf0cf69ce6a3a1
Author: Luboš Luňák 
AuthorDate: Sun Nov 28 19:21:18 2021 +0100
Commit: Luboš Luňák 
CommitDate: Mon Nov 29 19:46:23 2021 +0100

clang-cl: do not complain about precompiled_xxx.hxx include

It was complaining about the header being found using non-standard
Microsoft seach rules.

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

diff --git a/solenv/gbuild/platform/com_MSC_class.mk 
b/solenv/gbuild/platform/com_MSC_class.mk
index 16eb6c2ee4d3..2ca7466836b5 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -118,7 +118,8 @@ $(call gb_Helper_abbreviate_dirs,\
$(gb_COMPILERDEPFLAGS) \
$(5) \
-c $(3) \
-   -Yc$(notdir $(patsubst %.cxx,%.hxx,$(3))) -Fp$(1) -Fo$(1).obj) 
$(call gb_create_deps,$(call 
gb_PrecompiledHeader_get_dep_target_tmp,$(2),$(6)),$(1),$(3))
+   -Yc$(notdir $(patsubst %.cxx,%.hxx,$(3))) -I$(dir $(patsubst 
%.cxx,%.hxx,$(3))) -Fp$(1) -Fo$(1).obj) \
+   $(call gb_create_deps,$(call 
gb_PrecompiledHeader_get_dep_target_tmp,$(2),$(6)),$(1),$(3))
$(call gb_Trace_EndRange,$(2),PCH)
 endef
 

[Libreoffice-commits] core.git: solenv/gbuild

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

 solenv/gbuild/platform/com_MSC_defs.mk |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit c00b2c43c8f10755b1e7bfb32766e384d8964b3d
Author: Luboš Luňák 
AuthorDate: Sun Nov 28 19:11:50 2021 +0100
Commit: Luboš Luňák 
CommitDate: Mon Nov 29 13:52:51 2021 +0100

clang-cl says it doesn't know -Zc:inline

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

diff --git a/solenv/gbuild/platform/com_MSC_defs.mk 
b/solenv/gbuild/platform/com_MSC_defs.mk
index 7760cefcab8a..892fa3867ba8 100644
--- a/solenv/gbuild/platform/com_MSC_defs.mk
+++ b/solenv/gbuild/platform/com_MSC_defs.mk
@@ -132,7 +132,6 @@ gb_CXXFLAGS := \
-Gs \
-GS \
-Gy \
-   -Zc:inline \
$(if $(MSVC_USE_DEBUG_RUNTIME),-MDd,-MD) \
-nologo \
-W4 \
@@ -148,7 +147,10 @@ gb_CXXFLAGS := \
-wd4706 \
-bigobj \
 
+ifneq ($(COM_IS_CLANG),TRUE)
+gb_CXXFLAGS += -Zc:inline
 gb_CXXFLAGS_ZCINLINE_OFF := -Zc:inline-
+endif
 
 ifeq ($(CPUNAME),INTEL)
 

[Libreoffice-commits] core.git: solenv/gbuild

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

 solenv/gbuild/PrecompiledHeaders.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit d72237ff21db37f0d8c97f47c8583cba99f141df
Author: Luboš Luňák 
AuthorDate: Wed Nov 17 11:06:26 2021 +0100
Commit: Luboš Luňák 
CommitDate: Wed Nov 17 12:47:28 2021 +0100

fix system pch breaking after f22e5078cfac93c50ae5169f6545091

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

diff --git a/solenv/gbuild/PrecompiledHeaders.mk 
b/solenv/gbuild/PrecompiledHeaders.mk
index 312980265eca..9a8763657d2d 100644
--- a/solenv/gbuild/PrecompiledHeaders.mk
+++ b/solenv/gbuild/PrecompiledHeaders.mk
@@ -160,6 +160,7 @@ gb_PrecompiledHeader_ignore_flags_system := \
 -DVCL_INTERNALS \
 -DZLIB_CONST \
 -include $(SRCDIR)/pch/inc/clangfix.hxx \
+$(gb_PrecompiledHeader_ignore_flags_for_flags_file) \
 
 # Probably also update pch/inc/clangfix.hxx if you extend the list.
 

[Libreoffice-commits] core.git: solenv/gbuild

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

 solenv/gbuild/PrecompiledHeaders.mk |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 46520710560e53c6d488d71824694bf5e460ee07
Author: Luboš Luňák 
AuthorDate: Wed Nov 17 09:38:26 2021 +0100
Commit: Luboš Luňák 
CommitDate: Wed Nov 17 10:58:05 2021 +0100

avoid a PCH build failing because of a directory missing

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

diff --git a/solenv/gbuild/PrecompiledHeaders.mk 
b/solenv/gbuild/PrecompiledHeaders.mk
index be0ae7950c4d..312980265eca 100644
--- a/solenv/gbuild/PrecompiledHeaders.mk
+++ b/solenv/gbuild/PrecompiledHeaders.mk
@@ -55,8 +55,10 @@ $(call gb_PrecompiledHeader_get_dep_target,$(1),$(3)) :
 # change, and make the PCH depend on it => the PCH will be rebuilt on any 
flags change
 .PHONY: force
 $(call gb_PrecompiledHeader_get_flags_file,$(1),$(3)) : force
-   echo $(gb_PrecompiledHeader_flags_for_flags_file) | cmp -s - $$@ \
-   || echo $(gb_PrecompiledHeader_flags_for_flags_file) > $$@
+   $$(call gb_Helper_abbreviate_dirs,\
+   mkdir -p $$(dir $$@) && \
+   echo $(gb_PrecompiledHeader_flags_for_flags_file) | cmp -s - 
$$@ \
+   || echo $(gb_PrecompiledHeader_flags_for_flags_file) > $$@)
 
 # despite this being only one .d file, need to run concat-deps on it to
 # re-write external headers from UnpackedTarball

[Libreoffice-commits] core.git: solenv/gbuild

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

 solenv/gbuild/PrecompiledHeaders.mk|3 ++-
 solenv/gbuild/platform/com_GCC_defs.mk |2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit f22e5078cfac93c50ae5169f65450918b34b0e99
Author: Luboš Luňák 
AuthorDate: Tue Nov 16 15:03:27 2021 +0100
Commit: Luboš Luňák 
CommitDate: Tue Nov 16 18:36:23 2021 +0100

do not rebuild PCHs on icecream/ccache change, take #2

It turns out $(gb_SPACE) is not just one space.

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

diff --git a/solenv/gbuild/PrecompiledHeaders.mk 
b/solenv/gbuild/PrecompiledHeaders.mk
index 73cc86c88ee7..be0ae7950c4d 100644
--- a/solenv/gbuild/PrecompiledHeaders.mk
+++ b/solenv/gbuild/PrecompiledHeaders.mk
@@ -39,8 +39,9 @@ ifneq ($(gb_ENABLE_PCH),)
 # all cxxflags to use for compilation
 gb_PrecompiledHeader_cxxflags_includes := $$(PCH_DEFS) $$(PCH_CXXFLAGS) 
$$(gb_PrecompiledHeader_EXCEPTIONFLAGS)
 # flags to save to the .flags file to check if they are the same as last time
+# (note: the leading space in sed is important, to remove the option and its 
separating space)
 gb_PrecompiledHeader_flags_for_flags_file := $$(sort 
$(gb_PrecompiledHeader_cxxflags_includes)) \
-$(if $(gb_PrecompiledHeader_ignore_flags_for_flags_file),| sed 
's/$(gb_PrecompiledHeader_ignore_flags_for_flags_file)//')
+$(if $(gb_PrecompiledHeader_ignore_flags_for_flags_file),| sed 's/ 
$(gb_PrecompiledHeader_ignore_flags_for_flags_file)//')
 
 # $(call 
gb_PrecompiledHeader_generate_rules,pchtarget,linktarget,linktargetmakefilename,pchcxxfile,compiler)
 define gb_PrecompiledHeader_generate_rules
diff --git a/solenv/gbuild/platform/com_GCC_defs.mk 
b/solenv/gbuild/platform/com_GCC_defs.mk
index 4e82b607d8b9..c8f81ff15dc7 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -218,7 +218,7 @@ gb_PrecompiledHeader_EXCEPTIONFLAGS := 
$(gb_LinkTarget_EXCEPTIONFLAGS)
 # We turn on and off this one depending on whether icecream and/or ccache are 
used,
 # and changing cxxflags cause PCH rebuilds, so e.g. a plain temporary 
'CCACHE_DISABLE=1'
 # would cause a rebuild. Ignore the flag there, it's irrelevant for PCH use 
anyway.
-gb_PrecompiledHeader_ignore_flags_for_flags_file := $(gb_SPACE)-Wunused-macros
+gb_PrecompiledHeader_ignore_flags_for_flags_file := -Wunused-macros
 
 # optimization level
 gb_COMPILERNOOPTFLAGS := -O0 -fstrict-aliasing -fstrict-overflow

[Libreoffice-commits] core.git: solenv/gbuild

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

 solenv/gbuild/LinkTarget.mk |2 +-
 solenv/gbuild/PrecompiledHeaders.mk |   14 ++
 solenv/gbuild/platform/com_GCC_class.mk |   20 +++-
 solenv/gbuild/platform/com_GCC_defs.mk  |5 +
 solenv/gbuild/platform/com_MSC_class.mk |   12 +++-
 5 files changed, 34 insertions(+), 19 deletions(-)

New commits:
commit 359b53acdb14f1661e35c75d8c17fcac9b59faea
Author: Luboš Luňák 
AuthorDate: Sat Nov 13 09:32:15 2021 +0100
Commit: Luboš Luňák 
CommitDate: Sat Nov 13 13:43:39 2021 +0100

do not rebuild PCHs on icecream/ccache change

We turn -Wunused-macros on or off depending on whether icecream/ccache
are used, and since now PCHs rebuild on CXXFLAGS changes, a plain
temporary 'CCACHE_DISABLE=1' caused a rebuild.

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

diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 71be0790b59b..b0b716ace55b 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -1915,7 +1915,7 @@ $(call gb_LinkTarget_get_pch_reuse_timestamp,$(4)) : 
$(call gb_PrecompiledHeader
$(call gb_PrecompiledHeader_check_flags,$(4),$(2),\
$(call gb_PrecompiledHeader_get_target,$(3),$(4)),\
$(call gb_PrecompiledHeader_get_flags_file,$(3),$(4)),\
-   $$(PCH_CXXFLAGS) $$(PCH_DEFS) $$(gb_LinkTarget_EXCEPTIONFLAGS))
+   $(gb_PrecompiledHeader_cxxflags_includes))
$$(call gb_PrecompiledHeader__copy_reuse_files,$(1),$(3),$(4))
mkdir -p $$(dir $$@) && touch $$@
 
diff --git a/solenv/gbuild/PrecompiledHeaders.mk 
b/solenv/gbuild/PrecompiledHeaders.mk
index 28f2308c8e92..73cc86c88ee7 100644
--- a/solenv/gbuild/PrecompiledHeaders.mk
+++ b/solenv/gbuild/PrecompiledHeaders.mk
@@ -36,6 +36,12 @@ ifneq ($(gb_ENABLE_PCH),)
 # for $(1)'s and things that are constant.
 # The defines are needed to get the right version of 
gb_PrecompiledHeader__get_debugdir.
 
+# all cxxflags to use for compilation
+gb_PrecompiledHeader_cxxflags_includes := $$(PCH_DEFS) $$(PCH_CXXFLAGS) 
$$(gb_PrecompiledHeader_EXCEPTIONFLAGS)
+# flags to save to the .flags file to check if they are the same as last time
+gb_PrecompiledHeader_flags_for_flags_file := $$(sort 
$(gb_PrecompiledHeader_cxxflags_includes)) \
+$(if $(gb_PrecompiledHeader_ignore_flags_for_flags_file),| sed 
's/$(gb_PrecompiledHeader_ignore_flags_for_flags_file)//')
+
 # $(call 
gb_PrecompiledHeader_generate_rules,pchtarget,linktarget,linktargetmakefilename,pchcxxfile,compiler)
 define gb_PrecompiledHeader_generate_rules
 
@@ -48,8 +54,8 @@ $(call gb_PrecompiledHeader_get_dep_target,$(1),$(3)) :
 # change, and make the PCH depend on it => the PCH will be rebuilt on any 
flags change
 .PHONY: force
 $(call gb_PrecompiledHeader_get_flags_file,$(1),$(3)) : force
-   echo $$(sort $$(PCH_DEFS) $$(PCH_CXXFLAGS) 
$$(gb_PrecompiledHeader_EXCEPTIONFLAGS)) | cmp -s - $$@ \
-   || echo $$(sort $$(PCH_DEFS) $$(PCH_CXXFLAGS) 
$$(gb_PrecompiledHeader_EXCEPTIONFLAGS)) > $$@
+   echo $(gb_PrecompiledHeader_flags_for_flags_file) | cmp -s - $$@ \
+   || echo $(gb_PrecompiledHeader_flags_for_flags_file) > $$@
 
 # despite this being only one .d file, need to run concat-deps on it to
 # re-write external headers from UnpackedTarball
@@ -57,8 +63,8 @@ $(call gb_PrecompiledHeader_get_target,$(1),$(3)) :
test "$$(PCH_LINKTARGETMAKEFILENAME)" = "$(3)" \
 || ( echo "Error, PCH $(1) built by 
$$(PCH_LINKTARGETMAKEFILENAME) instead of $(3)" >&2; exit 1)
rm -f $$@
-   $$(call 
gb_PrecompiledHeader__command,$$@,$(1),$$<,$$(PCH_DEFS),$$(PCH_CXXFLAGS) 
$$(gb_PrecompiledHeader_EXCEPTIONFLAGS),$$(INCLUDE),$(3),$(5))
-   $$(call 
gb_PrecompiledHeader__sum_command,$$@,$(1),$$<,$$(PCH_DEFS),$$(PCH_CXXFLAGS) 
$$(gb_PrecompiledHeader_EXCEPTIONFLAGS),$$(INCLUDE),$(3))
+   $$(call 
gb_PrecompiledHeader__command,$$@,$(1),$$<,$(gb_PrecompiledHeader_cxxflags_includes),$$(INCLUDE),$(3),$(5))
+   $$(call 
gb_PrecompiledHeader__sum_command,$$@,$(1),$$<,$(gb_PrecompiledHeader_cxxflags_includes),$$(INCLUDE),$(3))
 ifeq ($(gb_FULLDEPS),$(true))
$$(call gb_Helper_abbreviate_dirs,\
RESPONSEFILE=$$(call gb_var2file,$$(shell 
$$(gb_MKTEMP)),200,$$(call gb_PrecompiledHeader_get_dep_target_tmp,$(1),$(3))) 
&& \
diff --git a/solenv/gbuild/platform/com_GCC_class.mk 
b/solenv/gbuild/platform/com_GCC_class.mk
index 58ec04c513bb..ba12572f4341 100644
--- a/solenv/gbuild/platform/com_GCC_class.mk
+++ b/solenv/gbuild/platform/com_GCC_class.mk
@@ -129,51 +129,53 @@ endif
 # This is for MSVC's object file built directly as a side-effect of building 
the PCH.
 gb_PrecompiledHeader_get_objectfile =
 
+# $(call 
gb_PrecompiledHeader__command,pchfile,pchtarget,source,cxxflags,includes,linktargetmakefilename,compiler)
 define 

[Libreoffice-commits] core.git: solenv/gbuild

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

 solenv/gbuild/LinkTarget.mk |5 -
 solenv/gbuild/PrecompiledHeaders.mk |   20 +---
 solenv/gbuild/TargetLocations.mk|1 +
 3 files changed, 18 insertions(+), 8 deletions(-)

New commits:
commit 5e7421b3895aa69ea874fc2ccf0f615b1163fbda
Author: Luboš Luňák 
AuthorDate: Fri Nov 12 11:34:41 2021 +0100
Commit: Luboš Luňák 
CommitDate: Fri Nov 12 13:21:19 2021 +0100

rebuild a PCH when the flags it was built with change

We already store the flags in a .flags file for another use, so just
handle the file as another make rule before the PCH rule and
if the file changes then the PCH rule will depend on something
that has changed.

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

diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index fe40fcbaf4ac..71be0790b59b 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -1853,6 +1853,7 @@ define gb_LinkTarget__set_precompiled_header_impl
 $(call gb_LinkTarget_get_clean_target,$(1)) : $(call 
gb_PrecompiledHeader_get_clean_target,$(3))
 $(call gb_PrecompiledHeader_get_target,$(3),$(4)) : $(call 
gb_CxxObject_get_source,$(SRCDIR),$(2))
 $(call gb_PrecompiledHeader_get_target,$(3),$(4)) : $(patsubst 
%.cxx,%.hxx,$(call gb_CxxObject_get_source,$(SRCDIR),$(2)))
+$(call gb_PrecompiledHeader_get_target,$(3),$(4)) : $(call 
gb_PrecompiledHeader_get_flags_file,$(3),$(4))
 
 $(call gb_PrecompiledHeader_get_target,$(3),$(4)) : $(call 
gb_LinkTarget_get_headers_target,$(1))
 
@@ -1912,7 +1913,9 @@ $(call gb_LinkTarget_get_pch_timestamp,$(4)) : $(call 
gb_LinkTarget_get_pch_reus
 # Depending directly on the PCH could cause that PCH to be built with this 
linktarget's flags.
 $(call gb_LinkTarget_get_pch_reuse_timestamp,$(4)) : $(call 
gb_PrecompiledHeader_get_for_reuse_target,$(3),$(4))
$(call gb_PrecompiledHeader_check_flags,$(4),$(2),\
-   $(call 
gb_PrecompiledHeader_get_target,$(3),$(4)),$$(PCH_CXXFLAGS) $$(PCH_DEFS) 
$$(gb_LinkTarget_EXCEPTIONFLAGS))
+   $(call gb_PrecompiledHeader_get_target,$(3),$(4)),\
+   $(call gb_PrecompiledHeader_get_flags_file,$(3),$(4)),\
+   $$(PCH_CXXFLAGS) $$(PCH_DEFS) $$(gb_LinkTarget_EXCEPTIONFLAGS))
$$(call gb_PrecompiledHeader__copy_reuse_files,$(1),$(3),$(4))
mkdir -p $$(dir $$@) && touch $$@
 
diff --git a/solenv/gbuild/PrecompiledHeaders.mk 
b/solenv/gbuild/PrecompiledHeaders.mk
index 60c56950350f..28f2308c8e92 100644
--- a/solenv/gbuild/PrecompiledHeaders.mk
+++ b/solenv/gbuild/PrecompiledHeaders.mk
@@ -44,6 +44,13 @@ $(call gb_PrecompiledHeader_get_dep_target,$(1),$(3)) :
mkdir -p $$(dir $$@) && \
echo "$$(call gb_PrecompiledHeader_get_target,$(1),$(3)) : 
$$(gb_Helper_PHONY)" > $$@)
 
+# keep the flags the PCH was built with in a separate file, update the file if 
and only if the flags
+# change, and make the PCH depend on it => the PCH will be rebuilt on any 
flags change
+.PHONY: force
+$(call gb_PrecompiledHeader_get_flags_file,$(1),$(3)) : force
+   echo $$(sort $$(PCH_DEFS) $$(PCH_CXXFLAGS) 
$$(gb_PrecompiledHeader_EXCEPTIONFLAGS)) | cmp -s - $$@ \
+   || echo $$(sort $$(PCH_DEFS) $$(PCH_CXXFLAGS) 
$$(gb_PrecompiledHeader_EXCEPTIONFLAGS)) > $$@
+
 # despite this being only one .d file, need to run concat-deps on it to
 # re-write external headers from UnpackedTarball
 $(call gb_PrecompiledHeader_get_target,$(1),$(3)) :
@@ -52,7 +59,6 @@ $(call gb_PrecompiledHeader_get_target,$(1),$(3)) :
rm -f $$@
$$(call 
gb_PrecompiledHeader__command,$$@,$(1),$$<,$$(PCH_DEFS),$$(PCH_CXXFLAGS) 
$$(gb_PrecompiledHeader_EXCEPTIONFLAGS),$$(INCLUDE),$(3),$(5))
$$(call 
gb_PrecompiledHeader__sum_command,$$@,$(1),$$<,$$(PCH_DEFS),$$(PCH_CXXFLAGS) 
$$(gb_PrecompiledHeader_EXCEPTIONFLAGS),$$(INCLUDE),$(3))
-   echo $$(sort $$(PCH_DEFS) $$(PCH_CXXFLAGS) 
$$(gb_PrecompiledHeader_EXCEPTIONFLAGS)) > $$(call 
gb_PrecompiledHeader_get_target,$(1),$(3)).flags
 ifeq ($(gb_FULLDEPS),$(true))
$$(call gb_Helper_abbreviate_dirs,\
RESPONSEFILE=$$(call gb_var2file,$$(shell 
$$(gb_MKTEMP)),200,$$(call gb_PrecompiledHeader_get_dep_target_tmp,$(1),$(3))) 
&& \
@@ -73,8 +79,8 @@ $(call gb_PrecompiledHeader_get_clean_target,$(1)) :
$$(call gb_PrecompiledHeader_get_target,$(1),$(3)).obj \
$$(call gb_PrecompiledHeader_get_target,$(1),$(3)).pdb \
$$(call gb_PrecompiledHeader_get_target,$(1),$(3)).sum \
-   $$(call 
gb_PrecompiledHeader_get_target,$(1),$(3)).flags \
-   $$(call 
gb_PrecompiledHeader_get_target,$(1),$(3)).reuse \
+   $$(call gb_PrecompiledHeader_get_flags_file,$(1),$(3)) \
+   $$(call 

[Libreoffice-commits] core.git: solenv/gbuild

[Stephan Bergmann (via logerrit)]

 solenv/gbuild/platform/com_MSC_defs.mk |1 -
 1 file changed, 1 deletion(-)

New commits:
commit a14b783bbe8eda32b4b79530d85ffc48b6ed0305
Author: Stephan Bergmann 
AuthorDate: Tue Nov 9 10:35:00 2021 +0100
Commit: Stephan Bergmann 
CommitDate: Tue Nov 9 11:49:54 2021 +0100

Drop global -D_HAS_AUTO_PTR_ETC from Windows build

...which had been added with 61c88ae6945c241f5f2aeb844eeca0776b487132 
"gbuild:
always compile as C++17 with MSVC 2017" but appears to be unnecessary now 
that
becbabbb785545af6a1799f5ecd445785534d478 "external/clucene: Remove 
unnecessary
uses of obsolete std::binary_function" removed code that relied on it.
(There are still a few targeted defines of _HAS_AUTO_PTR_ETC sprinkled 
across
the code where necessary.)

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

diff --git a/solenv/gbuild/platform/com_MSC_defs.mk 
b/solenv/gbuild/platform/com_MSC_defs.mk
index e1912285c4b7..39c284a6a16b 100644
--- a/solenv/gbuild/platform/com_MSC_defs.mk
+++ b/solenv/gbuild/platform/com_MSC_defs.mk
@@ -46,7 +46,6 @@ gb_COMPILERDEFS := \
-DBOOST_ERROR_CODE_HEADER_ONLY \
-DBOOST_OPTIONAL_USE_OLD_DEFINITION_OF_NONE \
-DBOOST_SYSTEM_NO_DEPRECATED \
-   -D_HAS_AUTO_PTR_ETC \
-D_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING \
-D_SILENCE_CXX17_OLD_ALLOCATOR_MEMBERS_DEPRECATION_WARNING \
-D_SILENCE_CXX17_RESULT_OF_DEPRECATION_WARNING \

[Libreoffice-commits] core.git: solenv/gbuild

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

 solenv/gbuild/ExternalProject.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 69ee81cc3947a91efb03eb10a117a3f1de5b92ad
Author: Luboš Luňák 
AuthorDate: Sun Nov 7 18:21:44 2021 +
Commit: Luboš Luňák 
CommitDate: Mon Nov 8 09:14:53 2021 +0100

set up gb_COMPILER_SETUP also for gbuild's ExternalProject

It's used to set up various ccache variables, which without this
aren't applied to builds handled by other build systems.

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

diff --git a/solenv/gbuild/ExternalProject.mk b/solenv/gbuild/ExternalProject.mk
index afb76c3a19d8..6f703f256174 100644
--- a/solenv/gbuild/ExternalProject.mk
+++ b/solenv/gbuild/ExternalProject.mk
@@ -222,7 +222,7 @@ $(call gb_Helper_print_on_error,cd $(EXTERNAL_WORKDIR)/$(3) 
&& \
unset Platform && \
$(if $(WRAPPERS),export $(WRAPPERS) &&) \
$(if $(NMAKE),export $(NMAKE) &&) \
-   $(2) && touch $@,$(EXTERNAL_WORKDIR)/$(if $(3),$(3)/,)$(if 
$(4),$(4),$(1).log))
+   $(gb_COMPILER_SETUP) $(2) && touch $@,$(EXTERNAL_WORKDIR)/$(if 
$(3),$(3)/,)$(if $(4),$(4),$(1).log))
 )
 endef
 

[Libreoffice-commits] core.git: solenv/gbuild

[Stephan Bergmann (via logerrit)]

 solenv/gbuild/platform/unxgcc.mk |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 7d4ff76868901fabd5a53ec951bbe1f05843960c
Author: Stephan Bergmann 
AuthorDate: Thu Nov 4 13:01:53 2021 +0100
Commit: Stephan Bergmann 
CommitDate: Thu Nov 4 14:35:29 2021 +0100

Fix check for libstdc++

...now that we have HAVE_LIBSTDCPP since
7158acde7756a264c09e24e1cfe4c81db700b920 "Consolidate -D_GLIBCXX_DEBUG for
--enable-dbgutil builds against libstdc++".  HAVE_LIBCXX was only ever 
defined
in config_host/config_libcxx.h (since 
90d2155912bcee40377620d4836726041a72d537
"Work around latest Boost 1.65.1 still using deprecated std::auto_ptr"), 
never
as a makefile variable, so this check (introduced in
b1141fa61073b3f24e1a3574afa55a954e5a153d "Cut down on -pthread/-lpthread
proliferation") always succeeded, whether libstdc++ or not.

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

diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index 10ce62f891ba..0cec2ecfbc0c 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -42,10 +42,10 @@ gb_CFLAGS := \
-Wdeclaration-after-statement \
-Wshadow \
 
-# At least libstdc++ (which is approximated here with !HAVE_LIBCXX) needs 
-pthread when including
-# various C++ headers like , see 
:
-ifeq ($(HAVE_LIBCXX),)
+# At least libstdc++ needs -pthread when including various C++ headers like 
, see
+# :
+ifneq ($(HAVE_LIBSTDCPP),)
 gb_CXX_LINKFLAGS := -pthread
 endif
 

[Libreoffice-commits] core.git: solenv/gbuild

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

 solenv/gbuild/LinkTarget.mk |   20 ++--
 solenv/gbuild/platform/com_GCC_class.mk |6 +++---
 solenv/gbuild/platform/com_MSC_class.mk |4 ++--
 3 files changed, 15 insertions(+), 15 deletions(-)

New commits:
commit fef55498e05717c51c3b3a9222fa460d609a9d3d
Author: Luboš Luňák 
AuthorDate: Sun Oct 31 20:17:13 2021 +0100
Commit: Luboš Luňák 
CommitDate: Mon Nov 1 09:44:53 2021 +0100

remove unused gb_CObject__command_pattern parameter

Usage removed in bc39f6b0e62b0a54500bf3986f971a43fe8f843d .

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

diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index b1cd59892b1d..0216802d271b 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -267,7 +267,7 @@ else
 $(call gb_CObject_get_target,%) : $(call gb_CObject_get_source,$(SRCDIR),%)
$(call gb_Output_announce,$*.c,$(true),$(if $(COMPILER_TEST),C? ,C  ),3)
$(call gb_Trace_StartRange,$*.c,$(if $(COMPILER_TEST),C? ,C  ))
-   $(call gb_CObject__command_pattern,$@,$(T_CFLAGS) 
$(T_CFLAGS_APPEND),$<,$(call 
gb_CObject_get_dep_target,$*),$(COMPILER_PLUGINS),$(T_SYMBOLS),$(T_CC))
+   $(call gb_CObject__command_pattern,$@,$(T_CFLAGS) 
$(T_CFLAGS_APPEND),$<,$(call 
gb_CObject_get_dep_target,$*),$(COMPILER_PLUGINS),$(T_CC))
$(call gb_Trace_EndRange,$*.c,$(if $(COMPILER_TEST),C? ,C  ))
 endif
 
@@ -330,7 +330,7 @@ $(call gb_CxxObject_get_target,%) : $(call 
gb_CxxObject_get_source,$(SRCDIR),%)
$(call gb_Output_announce,$*.cxx,$(true),$(if 
$(COMPILER_TEST),CPT,CXX),3)
$(call gb_Trace_StartRange,$*.cxx,$(if $(COMPILER_TEST),CPT,CXX))
$(eval $(gb_CxxObject__set_pchflags))
-   $(call gb_CObject__command_pattern,$@,$(T_CXXFLAGS) 
$(T_CXXFLAGS_APPEND) $(if $(COMPILER_TEST),$(gb_COMPILER_TEST_FLAGS)),$<,$(call 
gb_CxxObject_get_dep_target,$*),$(COMPILER_PLUGINS),$(T_SYMBOLS),$(T_CXX))
+   $(call gb_CObject__command_pattern,$@,$(T_CXXFLAGS) 
$(T_CXXFLAGS_APPEND) $(if $(COMPILER_TEST),$(gb_COMPILER_TEST_FLAGS)),$<,$(call 
gb_CxxObject_get_dep_target,$*),$(COMPILER_PLUGINS),$(T_CXX))
$(call gb_Trace_EndRange,$*.cxx,$(if $(COMPILER_TEST),CPT,CXX))
 endif
 
@@ -363,7 +363,7 @@ $(call gb_GenCObject_get_target,%) :
$(call gb_Output_announce,$*.c,$(true),C  ,3)
$(call gb_Trace_StartRange,$*.c,C  )
test -f $(call gb_GenCObject_get_source,$*) || (echo "Missing generated 
source file $(call gb_GenCObject_get_source,$*)" && false)
-   $(call gb_CObject__command_pattern,$@,$(T_CFLAGS) 
$(T_CFLAGS_APPEND),$(call gb_GenCObject_get_source,$*),$(call 
gb_GenCObject_get_dep_target,$*),$(COMPILER_PLUGINS),$(T_SYMBOLS),$(T_CC))
+   $(call gb_CObject__command_pattern,$@,$(T_CFLAGS) 
$(T_CFLAGS_APPEND),$(call gb_GenCObject_get_source,$*),$(call 
gb_GenCObject_get_dep_target,$*),$(COMPILER_PLUGINS),$(T_CC))
$(call gb_Trace_EndRange,$*.c,C  )
 endif
 
@@ -397,7 +397,7 @@ $(call gb_GenCxxObject_get_target,%) :
$(call gb_Trace_StartRange,$(subst $(BUILDDIR)/,,$(GEN_CXX_SOURCE)),CXX)
test -f $(GEN_CXX_SOURCE) || (echo "Missing generated source file 
$(GEN_CXX_SOURCE)" && false)
$(eval $(gb_CxxObject__set_pchflags))
-   $(call gb_CObject__command_pattern,$@,$(T_CXXFLAGS) 
$(T_CXXFLAGS_APPEND),$(GEN_CXX_SOURCE),$(call 
gb_GenCxxObject_get_dep_target,$*),$(COMPILER_PLUGINS),$(T_SYMBOLS),$(T_CXX))
+   $(call gb_CObject__command_pattern,$@,$(T_CXXFLAGS) 
$(T_CXXFLAGS_APPEND),$(GEN_CXX_SOURCE),$(call 
gb_GenCxxObject_get_dep_target,$*),$(COMPILER_PLUGINS),$(T_CXX))
$(call gb_Trace_EndRange,$(subst $(BUILDDIR)/,,$(GEN_CXX_SOURCE)),CXX)
 endif
 
@@ -430,7 +430,7 @@ $(call gb_GenCxxClrObject_get_target,%) :
$(call gb_Output_announce,$(subst 
$(BUILDDIR)/,,$(GEN_CXXCLR_SOURCE)),$(true),CLR,3)
$(call gb_Trace_StartRange,$(subst 
$(BUILDDIR)/,,$(GEN_CXXCLR_SOURCE)),CLR)
test -f $(GEN_CXXCLR_SOURCE) || (echo "Missing generated source file 
$(GEN_CXXCLR_SOURCE)" && false)
-   $(call gb_CObject__command_pattern,$@,$(T_CXXCLRFLAGS) 
$(T_CXXCLRFLAGS_APPEND),$(GEN_CXXCLR_SOURCE),$(call 
gb_GenCxxClrObject_get_dep_target,$*),$(COMPILER_PLUGINS),$(T_SYMBOLS))
+   $(call gb_CObject__command_pattern,$@,$(T_CXXCLRFLAGS) 
$(T_CXXCLRFLAGS_APPEND),$(GEN_CXXCLR_SOURCE),$(call 
gb_GenCxxClrObject_get_dep_target,$*),$(COMPILER_PLUGINS),)
$(call gb_Trace_EndRange,$(subst 
$(BUILDDIR)/,,$(GEN_CXXCLR_SOURCE)),CLR)
 endif
 
@@ -520,7 +520,7 @@ else
 $(call gb_ObjCxxObject_get_target,%) : $(call 
gb_ObjCxxObject_get_source,$(SRCDIR),%)
$(call gb_Output_announce,$*.mm,$(true),$(if 
$(COMPILER_TEST),O?X,OCX),3)
$(call gb_Trace_StartRange,$*.mm,$(if $(COMPILER_TEST),O?X,OCX))
-   $(call gb_CObject__command_pattern,$@,$(T_OBJCXXFLAGS) 

[Libreoffice-commits] core.git: solenv/gbuild

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

 solenv/gbuild/platform/com_MSC_class.mk |7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit bc39f6b0e62b0a54500bf3986f971a43fe8f843d
Author: Luboš Luňák 
AuthorDate: Sun Oct 31 13:53:28 2021 +
Commit: Luboš Luňák 
CommitDate: Sun Oct 31 20:13:28 2021 +0100

fix usage of MSVC's -debug:fastlink

Using /link while only compiling does nothing (and MSVC apparently
doesn't bother to warn). Fix gbuild to pass -debug:fastlink
when linking, and limit it to dbgutil builds, since pdb files
cannot be moved elsewhere if the option is used.

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

diff --git a/solenv/gbuild/platform/com_MSC_class.mk 
b/solenv/gbuild/platform/com_MSC_class.mk
index 0fff6a2caf20..1dffddb2599a 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -83,7 +83,7 @@ $(call gb_Helper_abbreviate_dirs,\
$(INCLUDE) \
-Fd$(PDBFILE) \
-c $(3) \
-   -Fo$(1)) $(if $(filter $(true),$(6)),/link /DEBUG:FASTLINK) \
+   -Fo$(1)) \
$(if $(COMPILER_TEST),,$(call gb_create_deps,$(4),$(1),$(3)))
 endef
 
@@ -301,7 +301,12 @@ gb_Windows_PE_TARGETTYPEFLAGS := \
-manifest
 
 # link.exe in -LIB mode doesn't understand -debug, use it only for EXEs and 
DLLs
+ifeq ($(gb_ENABLE_DBGUTIL),$(true))
+# fastlink is faster but pdb files reference .obj files
+gb_Windows_PE_TARGETTYPEFLAGS_DEBUGINFO := -debug:fastlink
+else
 gb_Windows_PE_TARGETTYPEFLAGS_DEBUGINFO := -debug
+endif
 
 ifeq ($(ENABLE_LTO),TRUE)
 gb_Windows_PE_TARGETTYPEFLAGS += -LTCG

[Libreoffice-commits] core.git: solenv/gbuild

[Christian Lohmaier (via logerrit)]

 solenv/gbuild/platform/com_GCC_defs.mk |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 899434244fb8b632159a82c1f61262a15058708c
Author: Christian Lohmaier 
AuthorDate: Wed Oct 27 20:19:44 2021 +0200
Commit: Christian Lohmaier 
CommitDate: Thu Oct 28 12:07:06 2021 +0200

-flto: only use firstword of PARALLELISM

jenkins agents use PARALLELISM with additional load limit, e.g.
PARALLELISM="16 -l 24" causing the linker to complain about not finding
-l24 when lto is enabled. So only use the first element/the number of
jobs to use and omit the load limit here.

Change-Id: Ie3e2bdbde1b89d9371d1d9b9e426f42a91d2eca8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124288
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/solenv/gbuild/platform/com_GCC_defs.mk 
b/solenv/gbuild/platform/com_GCC_defs.mk
index 2ca057c4f196..de3359f5dbd2 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -185,7 +185,8 @@ ifeq (,$(index,iOS MACOSX,$(OS)))
 gb_LTOPLUGINFLAGS := --plugin $(if $(LD_PLUGIN),$(LD_PLUGIN),LLVMgold.so)
 endif
 else
-gb_LTOFLAGS := -flto=$(if $(filter-out 0,$(PARALLELISM)),$(PARALLELISM),auto) 
-fuse-linker-plugin -O2
+# use first element of the PARALLELISM, to allow values like "12 -l 14" to 
specify load limits
+gb_LTOFLAGS := -flto=$(if $(filter-out 0,$(PARALLELISM)),$(firstword 
$(PARALLELISM)),auto) -fuse-linker-plugin -O2
 # clang does not support -flto=
 gb_CLANG_LTOFLAGS := -flto=thin
 endif

[Libreoffice-commits] core.git: solenv/gbuild

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

 solenv/gbuild/platform/com_GCC_defs.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 44f5a921e5293b92ce9b6822a7fbed5d59715b7c
Author: Luboš Luňák 
AuthorDate: Thu Oct 28 07:59:52 2021 +0200
Commit: Luboš Luňák 
CommitDate: Thu Oct 28 08:00:20 2021 +0200

move a comment to the proper place

Change-Id: I8d8b921febd0b57213bbb912a600e0c7698da555

diff --git a/solenv/gbuild/platform/com_GCC_defs.mk 
b/solenv/gbuild/platform/com_GCC_defs.mk
index 581ea2e0f0c7..2ca057c4f196 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -220,9 +220,9 @@ gb_DEBUGINFO_FLAGS=-g2
 endif
 gb_LINKER_DEBUGINFO_FLAGS=
 
-# GCC 11 defaults to -gdwarf-5, which GDB 10 doesn't support in split debug 
info
 ifeq ($(HAVE_GCC_SPLIT_DWARF),TRUE)
 gb_DEBUGINFO_FLAGS+=-gsplit-dwarf
+# GCC 11 defaults to -gdwarf-5, which GDB 10 doesn't support in split debug 
info
 ifeq ($(COM_IS_CLANG),)
 gb_DEBUGINFO_FLAGS+=-gdwarf-4
 endif

[Libreoffice-commits] core.git: solenv/gbuild

[Caolán McNamara (via logerrit)]

 solenv/gbuild/platform/macosx.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 79d27b6d6eab82d692c2b3547dacdd4e9190dc1e
Author: Caolán McNamara 
AuthorDate: Mon Oct 25 15:54:14 2021 +0100
Commit: Caolán McNamara 
CommitDate: Mon Oct 25 20:13:32 2021 +0200

bsd (as used by macOS) ar does not support '@' option

so gb_LinkTarget__command_staticlink should use the same workaround
for that as gb_LinkTarget__command_dynamiclink does

Change-Id: Ied9d8a3b99f09d6ea1b705e0c1ce3ef3b2d14190
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124156
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 50e37cd8df96..5aeb3a95ce86 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -153,7 +153,7 @@ $(call gb_Helper_abbreviate_dirs,\
$(foreach object,$(GENCXXOBJECTS),$(call 
gb_GenCxxObject_get_target,$(object))) \
$(foreach object,$(GENOBJCOBJECTS),$(call 
gb_GenObjCObject_get_target,$(object))) \
$(foreach object,$(GENOBJCXXOBJECTS),$(call 
gb_GenObjCxxObject_get_target,$(object))) \
-   $(foreach 
extraobjectlist,$(EXTRAOBJECTLISTS),@$(extraobjectlist)) \
+   $(foreach extraobjectlist,$(EXTRAOBJECTLISTS),$(shell cat 
$(extraobjectlist))) \
$(if $(findstring s,$(MAKEFLAGS)),2> /dev/null))
 endef
 

[Libreoffice-commits] core.git: solenv/gbuild

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

 solenv/gbuild/platform/filter-creatingLibrary.awk |   12 
 1 file changed, 12 insertions(+)

New commits:
commit 59fe5c0a9c3f21dbd2bae7f5886105ab9fc3727c
Author: Luboš Luňák 
AuthorDate: Thu Oct 14 13:29:48 2021 +0200
Commit: Luboš Luňák 
CommitDate: Thu Oct 14 15:23:42 2021 +0200

filter out also link.exe messages about LTO code generation

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

diff --git a/solenv/gbuild/platform/filter-creatingLibrary.awk 
b/solenv/gbuild/platform/filter-creatingLibrary.awk
index 5b3335ce8724..231609feb2d5 100755
--- a/solenv/gbuild/platform/filter-creatingLibrary.awk
+++ b/solenv/gbuild/platform/filter-creatingLibrary.awk
@@ -13,15 +13,27 @@
 
 BEGIN {
 creatinglibrary_prefix = ENVIRON["CREATINGLIBRARY_PREFIX"];
+generatingcode_message = ENVIRON["GENERATINGCODE_MESSAGE"];
+finishedgeneratingcode_message = ENVIRON["FINISHEDGENERATINGCODE_MESSAGE"];
 if (!creatinglibrary_prefix) {
 creatinglibrary_prefix = "\\.lib.*\\.exp"
 }
+if (!generatingcode_message) {
+generatingcode_message = "Generating code"
+}
+if (!finishedgeneratingcode_message) {
+finishedgeneratingcode_message = "Finished generating code"
+}
 firstline = 1
 }
 
 {
 if (firstline && match($0, creatinglibrary_prefix)) {
 # ignore
+} else if (match($0, generatingcode_message)) {
+# ignore
+} else if (match($0, finishedgeneratingcode_message)) {
+# ignore
 } else {
 # because MSVC stupidly prints errors on stdout, it's
 # necessary to forward everything that isn't matched by the pattern

[Libreoffice-commits] core.git: solenv/gbuild

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

 solenv/gbuild/platform/com_GCC_defs.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit aeef0d4931fea1ef25e907b30e35fcd059394f2d
Author: Luboš Luňák 
AuthorDate: Wed Oct 13 01:32:23 2021 +0200
Commit: Luboš Luňák 
CommitDate: Wed Oct 13 11:07:05 2021 +0200

use -flto=auto for gcc if no $PARALLELISM is set

I'm not sure if all gcc versions support the value, but if older
ones do not they at least silently accept it.

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

diff --git a/solenv/gbuild/platform/com_GCC_defs.mk 
b/solenv/gbuild/platform/com_GCC_defs.mk
index 619e9a691602..581ea2e0f0c7 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -185,7 +185,7 @@ ifeq (,$(index,iOS MACOSX,$(OS)))
 gb_LTOPLUGINFLAGS := --plugin $(if $(LD_PLUGIN),$(LD_PLUGIN),LLVMgold.so)
 endif
 else
-gb_LTOFLAGS := -flto$(if $(filter-out 0,$(PARALLELISM)),=$(PARALLELISM)) 
-fuse-linker-plugin -O2
+gb_LTOFLAGS := -flto=$(if $(filter-out 0,$(PARALLELISM)),$(PARALLELISM),auto) 
-fuse-linker-plugin -O2
 # clang does not support -flto=
 gb_CLANG_LTOFLAGS := -flto=thin
 endif

[Libreoffice-commits] core.git: solenv/gbuild

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

 solenv/gbuild/platform/com_MSC_class.mk |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit fb3e13cae8ab0915facaf07fe5fca177a4041a9b
Author: Luboš Luňák 
AuthorDate: Tue Oct 12 23:22:31 2021 +0200
Commit: Luboš Luňák 
CommitDate: Wed Oct 13 01:01:00 2021 +0200

MSVC LTO does not like mixing 32bit and 64 code

So disable LTO for x64 code when building for 32bit.

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

diff --git a/solenv/gbuild/platform/com_MSC_class.mk 
b/solenv/gbuild/platform/com_MSC_class.mk
index ca6c60064897..ad1bb2561262 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -68,7 +68,7 @@ $(call gb_Helper_abbreviate_dirs,\
$(call gb_CObject__compiler,$(2),$(3),$(7)) \
$(call gb_Helper_remove_overridden_flags, \
$(DEFS) \
-   $(gb_LTOFLAGS) \
+   $(if $(filter YES,$(LIBRARY_X64)), ,$(gb_LTOFLAGS)) \
$(2) $(if 
$(WARNINGS_DISABLED),$(gb_CXXFLAGS_DISABLE_WARNINGS)) \
$(if $(EXTERNAL_CODE), \
$(if $(filter -clr,$(2)),,$(if 
$(COM_IS_CLANG),-Wno-undef)), \
@@ -111,7 +111,7 @@ $(call gb_Helper_abbreviate_dirs,\
$(4) $(5) $(if 
$(WARNINGS_DISABLED),$(gb_CXXFLAGS_DISABLE_WARNINGS))) \
-Fd$(PDBFILE) \
$(if $(EXTERNAL_CODE),$(if 
$(COM_IS_CLANG),-Wno-undef),$(gb_DEFS_INTERNAL)) \
-   $(gb_LTOFLAGS) \
+   $(if $(filter YES,$(LIBRARY_X64)), ,$(gb_LTOFLAGS)) \
$(gb_COMPILERDEPFLAGS) \
$(6) \
-c $(3) \

[Libreoffice-commits] core.git: solenv/gbuild

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

 solenv/gbuild/LinkTarget.mk |   12 +++-
 solenv/gbuild/platform/com_GCC_class.mk |4 ++--
 solenv/gbuild/platform/com_GCC_defs.mk  |2 ++
 solenv/gbuild/platform/solaris.mk   |2 +-
 solenv/gbuild/platform/unxgcc.mk|2 +-
 5 files changed, 13 insertions(+), 9 deletions(-)

New commits:
commit 5b2848413883565c48d312c96daf8fbca25405d8
Author: Luboš Luňák 
AuthorDate: Mon Oct 11 22:28:06 2021 +0200
Commit: Luboš Luňák 
CommitDate: Mon Oct 11 23:33:30 2021 +0200

clang does not support -flto=

This may happen when building with GCC when Clang is used for Skia
and --with-parallelism is in effect.

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

diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index e047eeff2cc0..6c08c603267a 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -91,7 +91,7 @@ $(call gb_Helper_abbreviate_dirs,\
 ICECC=no CCACHE_DISABLE=1 \
$(gb_CC) \
$(DEFS) \
-   $(gb_LTOFLAGS) \
+   $(T_LTOFLAGS) \
$(if $(VISIBILITY),,$(gb_VISIBILITY_FLAGS)) \
$(if $(WARNINGS_NOT_ERRORS),$(if $(ENABLE_WERROR),$(if 
$(PLUGIN_WARNINGS_AS_ERRORS),$(gb_COMPILER_PLUGINS_WARNINGS_AS_ERRORS))),$(gb_CFLAGS_WERROR))
 \
$(if $(3),$(gb_COMPILER_PLUGINS)) \
@@ -106,7 +106,7 @@ $(call gb_Helper_abbreviate_dirs,\
 ICECC=no CCACHE_DISABLE=1 \
$(gb_CC) \
$(DEFS) \
-   $(gb_LTOFLAGS) \
+   $(T_LTOFLAGS) \
$(if $(VISIBILITY),,$(gb_VISIBILITY_FLAGS)) \
$(if $(WARNINGS_NOT_ERRORS),$(if $(ENABLE_WERROR),$(if 
$(PLUGIN_WARNINGS_AS_ERRORS),$(gb_COMPILER_PLUGINS_WARNINGS_AS_ERRORS))),$(gb_CFLAGS_WERROR))
 \
$(if $(3),$(gb_COMPILER_PLUGINS)) \
@@ -121,7 +121,7 @@ $(call gb_Helper_abbreviate_dirs,\
 ICECC=no CCACHE_DISABLE=1 \
$(gb_CXX) \
$(DEFS) \
-   $(gb_LTOFLAGS) \
+   $(T_LTOFLAGS) \
$(if $(VISIBILITY),,$(gb_VISIBILITY_FLAGS)) \
$(if $(WARNINGS_NOT_ERRORS),$(if $(ENABLE_WERROR),$(if 
$(PLUGIN_WARNINGS_AS_ERRORS),$(gb_COMPILER_PLUGINS_WARNINGS_AS_ERRORS))),$(gb_CFLAGS_WERROR))
 \
$(if $(3),$(gb_COMPILER_PLUGINS)) \
@@ -136,7 +136,7 @@ $(call gb_Helper_abbreviate_dirs,\
 ICECC=no CCACHE_DISABLE=1 \
$(gb_CXX) \
$(DEFS) \
-   $(gb_LTOFLAGS) \
+   $(T_LTOFLAGS) \
$(if $(VISIBILITY),,$(gb_VISIBILITY_FLAGS)) \
$(if $(WARNINGS_NOT_ERRORS),$(if $(ENABLE_WERROR),$(if 
$(PLUGIN_WARNINGS_AS_ERRORS),$(gb_COMPILER_PLUGINS_WARNINGS_AS_ERRORS))),$(gb_CFLAGS_WERROR))
 \
$(if $(3),$(gb_COMPILER_PLUGINS)) \
@@ -151,7 +151,7 @@ $(call gb_Helper_abbreviate_dirs,\
 ICECC=no CCACHE_DISABLE=1 \
$(gb_CXX) \
$(DEFS) \
-   $(gb_LTOFLAGS) \
+   $(T_LTOFLAGS) \
$(if $(VISIBILITY),,$(gb_VISIBILITY_FLAGS)) \
$(if $(WARNINGS_NOT_ERRORS),$(if $(ENABLE_WERROR),$(if 
$(PLUGIN_WARNINGS_AS_ERRORS),$(gb_COMPILER_PLUGINS_WARNINGS_AS_ERRORS))),$(gb_CFLAGS_WERROR))
 \
$(if $(3),$(gb_COMPILER_PLUGINS)) \
@@ -971,6 +971,7 @@ $(call gb_LinkTarget_get_target,$(1)) : T_FORCE_COMPILE := 
$(if $(call gb_LinkTa
 $(call gb_LinkTarget_get_target,$(1)) : T_CC :=
 $(call gb_LinkTarget_get_target,$(1)) : T_CXX :=
 $(call gb_LinkTarget_get_target,$(1)) : T_USE_LD := $(USE_LD)
+$(call gb_LinkTarget_get_target,$(1)) : T_LTOFLAGS := $(gb_LTOFLAGS)
 
 ifeq ($(gb_FULLDEPS),$(true))
 ifeq (depcache:,$(filter depcache,$(.FEATURES)):$(gb_PARTIAL_BUILD))
@@ -1985,6 +1986,7 @@ 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_LD := $(or 
$(CLANG_USE_LD),$(USE_LD))
+$(call gb_LinkTarget_get_target,$(1)) : T_LTOFLAGS := $(or 
$(gb_CLANG_LTOFLAGS),$(gb_LTOFLAGS))
 endef
 
 # call gb_LinkTarget_use_glxtest,linktarget,add_libs
diff --git a/solenv/gbuild/platform/com_GCC_class.mk 
b/solenv/gbuild/platform/com_GCC_class.mk
index 9407488c5c4d..aa3f94ef785d 100644
--- a/solenv/gbuild/platform/com_GCC_class.mk
+++ b/solenv/gbuild/platform/com_GCC_class.mk
@@ -42,7 +42,7 @@ $(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $(1)) $(dir $(4)) && cd $(SRCDIR) && \
$(gb_CC) \
-x assembler-with-cpp \
-   $(gb_LTOFLAGS) \
+   $(T_LTOFLAGS) \
$(gb_AFLAGS) \
-c $(3) \
-o $(1)) \
@@ -73,7 +73,7 @@ $(call gb_Helper_abbreviate_dirs,\
$(if $(5),$(gb_COMPILER_PLUGINS_SETUP)) \
$(call 

[Libreoffice-commits] core.git: solenv/gbuild

[Caolán McNamara (via logerrit)]

 solenv/gbuild/AllLangMoTarget.mk |4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit efcbb6d89f49079e9ca7a2b3689699ccfcb6bf2a
Author: Caolán McNamara 
AuthorDate: Wed Oct 6 17:12:11 2021 +0100
Commit: Caolán McNamara 
CommitDate: Thu Oct 7 14:56:38 2021 +0200

remove python make dependency from MoTarget

not needed since...

commit 7fdf1663ed8e689e7fb154ab22a9dcb7fc7bf43c
Author: Caolán McNamara 
Date:   Thu Sep 14 15:57:38 2017 +0100

remove interim update module for gettext support

Change-Id: I05df619848cde842a5cda79d20e013914ce882d4

Change-Id: I094c033db356f32b93c77f7bdbd4ce5be8b0b0ae
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123151
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/solenv/gbuild/AllLangMoTarget.mk b/solenv/gbuild/AllLangMoTarget.mk
index 681c399d5860..ec05985d5ecc 100644
--- a/solenv/gbuild/AllLangMoTarget.mk
+++ b/solenv/gbuild/AllLangMoTarget.mk
@@ -32,9 +32,7 @@ $(call gb_MoTarget_get_clean_target,%) :
$(call gb_MoTarget_get_target,$*) \
$(call gb_MoTarget_get_install_target,$*))
 
-$(call gb_MoTarget_get_target,%) : \
-   $(gb_Helper_MISCDUMMY) \
-   $(call gb_ExternalExecutable_get_dependencies,python)
+$(call gb_MoTarget_get_target,%) : $(gb_Helper_MISCDUMMY)
$(call gb_Output_announce,$*,$(true),MO ,2)
$(call gb_Trace_StartRange,$*,MO )
$(call gb_Helper_abbreviate_dirs,\

[Libreoffice-commits] core.git: solenv/gbuild

[Caolán McNamara (via logerrit)]

 solenv/gbuild/AllLangMoTarget.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d96b8df690facebc741a2d6d099d95a7b86abbea
Author: Caolán McNamara 
AuthorDate: Sun Oct 3 16:59:33 2021 +0100
Commit: Caolán McNamara 
CommitDate: Sun Oct 3 20:54:12 2021 +0200

unterminated call to function 'call': missing ')'.

Change-Id: Ida812eb3a002da3d99ddf3179d674a653f7ed2b9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123027
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/solenv/gbuild/AllLangMoTarget.mk b/solenv/gbuild/AllLangMoTarget.mk
index f48bbca85364..681c399d5860 100644
--- a/solenv/gbuild/AllLangMoTarget.mk
+++ b/solenv/gbuild/AllLangMoTarget.mk
@@ -39,7 +39,7 @@ $(call gb_MoTarget_get_target,%) : \
$(call gb_Trace_StartRange,$*,MO )
$(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $@) && \
-   $(MSGUNIQ) --force-po 
$(gb_POLOCATION)/$(LANGUAGE)/$(POLOCATION)/messages.po | $(MSGFMT) - -o $@; \
+   $(MSGUNIQ) --force-po 
$(gb_POLOCATION)/$(LANGUAGE)/$(POLOCATION)/messages.po | $(MSGFMT) - -o $@)
$(call gb_Trace_EndRange,$*,MO )
 
 #$(info $(call gb_MoTarget_get_target,$(1)))

[Libreoffice-commits] core.git: solenv/gbuild

[Tor Lillqvist (via logerrit)]

 solenv/gbuild/TargetLocations.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6b6400d72fe4112b230ffe31b9bea7d2a7f2f9f4
Author: Tor Lillqvist 
AuthorDate: Thu Sep 23 11:30:27 2021 +0300
Commit: Tor Lillqvist 
CommitDate: Thu Sep 23 12:15:52 2021 +0200

Look for the udkapi types.rdb file in the right place when cross-compiling

Fixes cross-compilation to iOS on macOS.

Previously is was looking for
  instdir_for_build/LibreOfficeDev.app/Contents/program/types.rdb

The correct location is
  
instdir_for_build/LibreOfficeDev.app/Contents/Resources/ure/share/misc/types.rdb

Now it is possible to build the master branch for iOS again. (No idea
whether it works.)

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

diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index 454c167cb318..62deb5122ec0 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -29,7 +29,7 @@ gb_PackagePart_get_destinations = \
 
 # kind of lame but with just 3 of these why bother with registration etc.
 gb_UnoApi_get_target = $(INSTROOT)/$(if $(filter 
udkapi,$(1)),$(LIBO_URE_MISC_FOLDER)/types,$(LIBO_ETC_FOLDER)/types/$(1)).rdb
-gb_UnoApi_get_target_for_build = $(INSTROOT_FOR_BUILD)/$(if $(filter 
udkapi,$(1)),$(LIBO_URE_MISC_FOLDER)/types,$(LIBO_ETC_FOLDER)/types/$(1)).rdb
+gb_UnoApi_get_target_for_build = $(INSTROOT_FOR_BUILD)/$(if $(filter 
udkapi,$(1)),$(LIBO_URE_MISC_FOLDER_FOR_BUILD)/types,$(LIBO_ETC_FOLDER)/types/$(1)).rdb
 
 # workdir target patterns
 

[Libreoffice-commits] core.git: solenv/gbuild

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

 solenv/gbuild/platform/com_MSC_class.mk |   36 ++--
 1 file changed, 21 insertions(+), 15 deletions(-)

New commits:
commit 6507eddc2d760c8807633268558c47e8cb06
Author: Luboš Luňák 
AuthorDate: Wed Sep 22 12:28:37 2021 +
Commit: Luboš Luňák 
CommitDate: Wed Sep 22 15:33:07 2021 +0200

avoid some more D9025 warnings

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

diff --git a/solenv/gbuild/platform/com_MSC_class.mk 
b/solenv/gbuild/platform/com_MSC_class.mk
index 3ea82e6c4936..ca6c60064897 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -47,10 +47,16 @@ endef
 
 # Avoid annoying warning D9025 about overriding command-line arguments.
 gb_Helper_remove_overridden_flags = \
+$(filter-out -W4 -w -arch:SSE -arch:SSE2 -arch:AVX -arch:AVX2 -Od -O2 
-Zc:inline -Zc:inline- \
+-Zc:dllexportInlines -Zc:dllexportInlines- -EHs -EHa -DNOMINMAX 
-UNOMINMAX -D_X86_=1 -U_X86_ \
+-D_AMD64_=1 -U_AMD64_,$(1)) \
 $(lastword $(filter -W4 -w,$(1))) \
-$(filter-out -W4 -w -arch:SSE -arch:SSE2 -arch:AVX -arch:AVX2 -Od -O2 
-Zc:inline -Zc:inline- -Zc:dllexportInlines -Zc:dllexportInlines-,$(1)) \
 $(lastword $(filter -Od -O2,$(1))) \
 $(lastword $(filter -arch:SSE -arch:SSE2 -arch:AVX -arch:AVX2,$(1))) \
+$(lastword $(filter -EHs -EHa,$(1))) \
+$(lastword $(filter -DNOMINMAX -UNOMINMAX,$(1))) \
+$(lastword $(filter -D_X86_=1 -U_X86_,$(1))) \
+$(lastword $(filter -D_AMD64_=1 -U_AMD64_,$(1))) \
 $(lastword $(filter -Zc:inline -Zc:inline-,$(1))) \
 $(lastword $(filter -Zc:dllexportInlines -Zc:dllexportInlines-,$(1)))
 
@@ -60,22 +66,22 @@ $(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $(1)) $(dir $(4)) && \
unset INCLUDE && \
$(call gb_CObject__compiler,$(2),$(3),$(7)) \
-   $(DEFS) \
-   $(gb_LTOFLAGS) \
$(call gb_Helper_remove_overridden_flags, \
-   $(2) $(if 
$(WARNINGS_DISABLED),$(gb_CXXFLAGS_DISABLE_WARNINGS))) \
-   $(if $(EXTERNAL_CODE), \
-   $(if $(filter -clr,$(2)),,$(if 
$(COM_IS_CLANG),-Wno-undef)), \
-   $(gb_DEFS_INTERNAL)) \
-   $(if $(WARNINGS_NOT_ERRORS),$(if $(ENABLE_WERROR),$(if 
$(PLUGIN_WARNINGS_AS_ERRORS),$(gb_COMPILER_PLUGINS_WARNINGS_AS_ERRORS))),$(gb_CFLAGS_WERROR))
 \
-   $(if $(filter -clr,$(2)),,$(if $(5),$(gb_COMPILER_PLUGINS))) \
-   $(if $(COMPILER_TEST),-fsyntax-only -ferror-limit=0 -Xclang 
-verify) \
-   -Fd$(PDBFILE) \
-   $(PCHFLAGS) \
-   $(if $(COMPILER_TEST),,$(gb_COMPILERDEPFLAGS)) \
+   $(DEFS) \
+   $(gb_LTOFLAGS) \
+   $(2) $(if 
$(WARNINGS_DISABLED),$(gb_CXXFLAGS_DISABLE_WARNINGS)) \
+   $(if $(EXTERNAL_CODE), \
+   $(if $(filter -clr,$(2)),,$(if 
$(COM_IS_CLANG),-Wno-undef)), \
+   $(gb_DEFS_INTERNAL)) \
+   $(if $(WARNINGS_NOT_ERRORS),$(if $(ENABLE_WERROR),$(if 
$(PLUGIN_WARNINGS_AS_ERRORS),$(gb_COMPILER_PLUGINS_WARNINGS_AS_ERRORS))),$(gb_CFLAGS_WERROR))
 \
+   $(if $(filter -clr,$(2)),,$(if 
$(5),$(gb_COMPILER_PLUGINS))) \
+   $(if $(COMPILER_TEST),-fsyntax-only -ferror-limit=0 
-Xclang -verify) \
+   $(PCHFLAGS) \
+   $(if $(COMPILER_TEST),,$(gb_COMPILERDEPFLAGS)) \
+   $(if $(filter YES,$(LIBRARY_X64)), -U_X86_ -D_AMD64_,) \
+   $(if $(filter YES,$(PE_X86)), -D_X86_ -U_AMD64_,)) \
$(INCLUDE) \
-   $(if $(filter YES,$(LIBRARY_X64)), -U_X86_ -D_AMD64_,) \
-   $(if $(filter YES,$(PE_X86)), -D_X86_ -U_AMD64_,) \
+   -Fd$(PDBFILE) \
-c $(3) \
-Fo$(1)) $(if $(filter $(true),$(6)),/link /DEBUG:FASTLINK) \
$(if $(COMPILER_TEST),,$(call gb_create_deps,$(4),$(1),$(3)))

[Libreoffice-commits] core.git: solenv/gbuild

[Tor Lillqvist (via logerrit)]

 solenv/gbuild/platform/iOS.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit a542f9f4f7d1cc4a499f260209c70f086322c26c
Author: Tor Lillqvist 
AuthorDate: Wed Sep 22 12:53:20 2021 +0300
Commit: Tor Lillqvist 
CommitDate: Wed Sep 22 14:09:00 2021 +0200

Apparently we need to define gb_Library_PLAINEXT_FOR_BUILD for iOS

Helps a build for iOS proceed a bit further.

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

diff --git a/solenv/gbuild/platform/iOS.mk b/solenv/gbuild/platform/iOS.mk
index 0188d1cc94c2..95c5461409eb 100644
--- a/solenv/gbuild/platform/iOS.mk
+++ b/solenv/gbuild/platform/iOS.mk
@@ -142,6 +142,7 @@ gb_Library_DEFS :=
 gb_Library_SYSPRE := lib
 gb_Library_UNOVERPRE := $(gb_Library_SYSPRE)uno_
 gb_Library_PLAINEXT := .a
+gb_Library_PLAINEXT_FOR_BUILD := .dylib
 gb_Library_DLLEXT := .a
 gb_Library_RTEXT := gcc3$(gb_Library_PLAINEXT)
 

[Libreoffice-commits] core.git: solenv/gbuild

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

 solenv/gbuild/LinkTarget.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit bb09bfd25f25fb959123df1c01a52b8dffa97f50
Author: Luboš Luňák 
AuthorDate: Wed Sep 22 00:39:50 2021 +0200
Commit: Luboš Luňák 
CommitDate: Wed Sep 22 02:30:35 2021 +0200

make .pch file also depend on its source .hxx file

This dependency is normally handled by either the .pch not existing
(and so it needs building), or GCC/Clang output it in the deps,
but MSVC doesn't seem to provide this dependency, so modifying
the .hxx there doesn't trigger a rebuild.

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

diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 91dc20adc72f..e047eeff2cc0 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -1778,6 +1778,7 @@ endef
 define gb_LinkTarget__set_precompiled_header_impl
 $(call gb_LinkTarget_get_clean_target,$(1)) : $(call 
gb_PrecompiledHeader_get_clean_target,$(3))
 $(call gb_PrecompiledHeader_get_target,$(3),$(4)) : $(call 
gb_CxxObject_get_source,$(SRCDIR),$(2))
+$(call gb_PrecompiledHeader_get_target,$(3),$(4)) : $(patsubst 
%.cxx,%.hxx,$(call gb_CxxObject_get_source,$(SRCDIR),$(2)))
 
 $(call gb_PrecompiledHeader_get_target,$(3),$(4)) : $(call 
gb_LinkTarget_get_headers_target,$(1))
 

[Libreoffice-commits] core.git: solenv/gbuild

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

 solenv/gbuild/Module.mk |8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit a6bccaf72f69428bffd6688917491ef921383456
Author: Luboš Luňák 
AuthorDate: Fri Sep 17 14:46:10 2021 +0200
Commit: Luboš Luňák 
CommitDate: Sun Sep 19 10:46:13 2021 +0200

make "-external/" valid gbuild exclusion for FORCE_COMPILE

Get the name of the directory extra level up, which is 'external'
for external modules, and check that too.

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

diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk
index 9eddc41683a4..fcedbc95f248 100644
--- a/solenv/gbuild/Module.mk
+++ b/solenv/gbuild/Module.mk
@@ -249,12 +249,16 @@ $(WORKDIR)/pot.done : $(foreach exec,cfgex helpex 
localize propex ulfex xrmex tr
&& touch $@)
 
 # enable if: no "-MODULE/" defined AND ["all" defined OR "MODULE/" defined]
+# $(1) is module name, $(2) is directory name two levels up (for externals 
it's 'external')
 gb_Module__symbols_enabled = \
  $(and $(if $(filter -$(1)/,$(gb_ENABLE_SYMBOLS_FOR)),,$(true)),\
+   $(if $(filter -$(2)/,$(gb_ENABLE_SYMBOLS_FOR)),,$(true)),\
$(filter all $(1)/,$(gb_ENABLE_SYMBOLS_FOR)))
 # enable if: no "-MODULE/" defined AND ["all" defined OR "MODULE/" defined]
+# $(1) is module name, $(2) is directory name two levels up (for externals 
it's 'external')
 gb_Module__force_compile = \
  $(and $(if $(filter -$(1)/,$(FORCE_COMPILE)),,$(true)),\
+   $(if $(filter -$(2)/,$(FORCE_COMPILE)),,$(true)),\
$(filter all $(1)/,$(FORCE_COMPILE)))
 
 define gb_Module_Module
@@ -270,8 +274,8 @@ gb_Module_SUBSEQUENTCHECKTARGETSTACK := $(call 
gb_Module_get_subsequentcheck_tar
 gb_Module_STAGINGCHECKTARGETSTACK := $(call 
gb_Module_get_stagingcheck_target,$(1)) $(gb_Module_STAGINGCHECKTARGETSTACK)
 gb_Module_PERFCHECKTARGETSTACK := $(call gb_Module_get_perfcheck_target,$(1)) 
$(gb_Module_PERFCHECKTARGETSTACK)
 gb_Module_CLEANTARGETSTACK := $(call gb_Module_get_clean_target,$(1)) 
$(gb_Module_CLEANTARGETSTACK)
-gb_Module_CURRENTMODULE_SYMBOLS_ENABLED := $(call 
gb_Module__symbols_enabled,$(1))
-gb_Module_CURRENTMODULE_FORCE_COMPILE := $(call gb_Module__force_compile,$(1))
+gb_Module_CURRENTMODULE_SYMBOLS_ENABLED := $(call 
gb_Module__symbols_enabled,$(1),$(notdir $(realpath $(dir $(realpath $(lastword 
$(MAKEFILE_LIST../)))
+gb_Module_CURRENTMODULE_FORCE_COMPILE := $(call 
gb_Module__force_compile,$(1),$(notdir $(realpath $(dir $(realpath $(lastword 
$(MAKEFILE_LIST../)))
 gb_Module_CURRENTMODULE_NAME := $(1)
 $(call gb_Helper_make_userfriendly_targets,$(1),Module)
 $(if $(filter-out libreoffice instsetoo_native android ios,$(1)),\

[Libreoffice-commits] core.git: solenv/gbuild

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

 solenv/gbuild/PrecompiledHeaders.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit dacdcfe71e18be6493328c37b20da560f2867f7a
Author: Luboš Luňák 
AuthorDate: Sat Sep 11 09:11:14 2021 +0200
Commit: Luboš Luňák 
CommitDate: Sat Sep 11 09:11:52 2021 +0200

add -DSYSTEM_NSS to flags ignored for system PCH

Change-Id: I4afdf324956b0280ceeaf2d18174dedbb091b5b0

diff --git a/solenv/gbuild/PrecompiledHeaders.mk 
b/solenv/gbuild/PrecompiledHeaders.mk
index d02668e1e930..4b2409952599 100644
--- a/solenv/gbuild/PrecompiledHeaders.mk
+++ b/solenv/gbuild/PrecompiledHeaders.mk
@@ -132,6 +132,7 @@ gb_PrecompiledHeader_ignore_flags_system := \
 -DSYSTEM_EXPAT \
 -DSYSTEM_LIBXML \
 -DSYSTEM_ZLIB \
+-DSYSTEM_NSS \
 -DHAVE_VALGRIND_HEADERS \
 -DUSE_RANDR \
 -DUSE_XINERAMA_XORG \

[Libreoffice-commits] core.git: solenv/gbuild

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

 solenv/gbuild/platform/macosx.mk |4 
 1 file changed, 4 insertions(+)

New commits:
commit 61a83cdeac14f6e5b1639e26a31145653d753785
Author: Luboš Luňák 
AuthorDate: Wed Aug 18 19:26:13 2021 +0200
Commit: Luboš Luňák 
CommitDate: Mon Aug 23 14:58:32 2021 +0200

fix ObjC/C++ generated sources linking on Mac

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

diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index a24cefe1080e..50e37cd8df96 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -107,6 +107,8 @@ $(call gb_Helper_abbreviate_dirs,\
$(foreach object,$(OBJCXXOBJECTS),$(call 
gb_ObjCxxObject_get_target,$(object))) \
$(foreach object,$(GENCOBJECTS),$(call 
gb_GenCObject_get_target,$(object))) \
$(foreach object,$(GENCXXOBJECTS),$(call 
gb_GenCxxObject_get_target,$(object))) \
+   $(foreach object,$(GENOBJCOBJECTS),$(call 
gb_GenObjCObject_get_target,$(object))) \
+   $(foreach object,$(GENOBJCXXOBJECTS),$(call 
gb_GenObjCxxObject_get_target,$(object))) \
$(foreach extraobjectlist,$(EXTRAOBJECTLISTS),$(shell cat 
$(extraobjectlist && \
cat $${FILELIST} | tr "[:space:]" "\n" | grep -v '^$$' > $${FILELIST}.1 
&& \
mv $${FILELIST}.1 $${FILELIST} && \
@@ -149,6 +151,8 @@ $(call gb_Helper_abbreviate_dirs,\
$(foreach object,$(OBJCXXOBJECTS),$(call 
gb_ObjCxxObject_get_target,$(object))) \
$(foreach object,$(GENCOBJECTS),$(call 
gb_GenCObject_get_target,$(object))) \
$(foreach object,$(GENCXXOBJECTS),$(call 
gb_GenCxxObject_get_target,$(object))) \
+   $(foreach object,$(GENOBJCOBJECTS),$(call 
gb_GenObjCObject_get_target,$(object))) \
+   $(foreach object,$(GENOBJCXXOBJECTS),$(call 
gb_GenObjCxxObject_get_target,$(object))) \
$(foreach 
extraobjectlist,$(EXTRAOBJECTLISTS),@$(extraobjectlist)) \
$(if $(findstring s,$(MAKEFLAGS)),2> /dev/null))
 endef