helpcontent2 | 2 +-
solenv/gbuild/ExternalExecutable.mk | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit c9de64e92cac1f4b9907399d7f51f70021f7e39c
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Wed Dec 14 11:42:16 2022 +0100
Commit: Gerrit Code Review <ger...@gerrit.libreoffice.org>
CommitDate: Wed Dec 14 10:42:16 2022 +0000
Update git submodules
* Update helpcontent2 from branch 'master'
to 970907045a2400da7ed6e3d14ef76f7ad3b2d783
- Fix prepending xargs to gb_ExternalExecutable_get_command, help part
...as was done in f048f02f505704a76c4f01b4ff3f369e8ed928b5 "hid2file.js
generation: process in batch, not each file one-by-one", causing my
build to
fail with
> [XSL] CustomTarget/helpcontent2/help3xsl/hid2file.js
> xargs:
LD_LIBRARY_PATH=/home/sbergman/gcc/trunk/inst/lib64:/home/sbergman/lo/core/instdir/program:/home/sbergman/lo/core/instdir/program:
No such file or directory
Change-Id: I94ea42878de55a887e6955b350997425438bb90e
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/144154
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/helpcontent2 b/helpcontent2
index e3b1cce7dde7..970907045a24 160000
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit e3b1cce7dde7e964c7670dd24a167e750654685a
+Subproject commit 970907045a2400da7ed6e3d14ef76f7ad3b2d783
commit 3d117dcc4a705f477c8223978200756ac9f83fe3
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Wed Dec 14 09:42:04 2022 +0100
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Wed Dec 14 10:42:00 2022 +0000
Fix prepending xargs to gb_ExternalExecutable_get_command, core part
...as was done in
<https://git.libreoffice.org/help/+/f048f02f505704a76c4f01b4ff3f369e8ed928b5%5E!>
"hid2file.js generation: process in batch, not each file one-by-one",
causing my
build to fail with
> [XSL] CustomTarget/helpcontent2/help3xsl/hid2file.js
> xargs:
LD_LIBRARY_PATH=/home/sbergman/gcc/trunk/inst/lib64:/home/sbergman/lo/core/instdir/program:/home/sbergman/lo/core/instdir/program:
No such file or directory
Change-Id: I5a58874aa746de13cfc86b691c11349196092dce
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144151
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/solenv/gbuild/ExternalExecutable.mk
b/solenv/gbuild/ExternalExecutable.mk
index 7a0fd996dd53..0982dd9b8e7f 100644
--- a/solenv/gbuild/ExternalExecutable.mk
+++ b/solenv/gbuild/ExternalExecutable.mk
@@ -185,6 +185,7 @@ endef
define gb_ExternalExecutable__get_command
$(call gb_ExternalExecutale__check_registration,$(1))
$(gb_ExternalExecutable_$(1)_PRECOMMAND) \
+ $(2) \
$(call gb_ExternalExecutable__get_internal,$(1)) \
$(call gb_ExternalExecutable__get_executable,$(1)) \
$(gb_ExternalExecutable_$(1)_ARGUMENTS)
@@ -196,9 +197,12 @@ endef
# LD_LIBRARY_PATH for internally built executables), and icerun wrapper
# for limiting the maximum number of processes, if available.
#
+# $2 is an optional part (like "xargs") to place between the setting of shell
variables and the
+# command proper.
+#
# gb_ExternalExecutable_get_command executable
define gb_ExternalExecutable_get_command
-$(strip $(call gb_ExternalExecutable__get_command,$(1)))
+$(strip $(call gb_ExternalExecutable__get_command,$(1),$(2)))
endef
define gb_ExternalExecutable__get_dependencies
