solenv/gbuild/Extension.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit ae3dcef7049d3dd8ca171909c66ddb5d74ce9f94
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Wed Dec 9 09:36:33 2020 +0100
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Wed Dec 9 14:17:31 2020 +0100
One more gbuild $ -> $$ fix
...similar to cc630e3d8ee5d07b7341b071443845ef309eeeb2 "One more gbuild $
-> $$
fix". (In a Linux --with-package-format=archive build against a GCC 11
trunk
libstdc++ installed in a non-standard location, so requiring
LD_LIBRARY_PATH set
from outside the GNU Make invocation, `make Extension_nlpsolver` failed with
> [XHP] nlpsolver com.sun.star.comp.Calc.NLPSolver/Options.xhp qtz
> S=~/lo/core && I=$S/instdir && W=$S/workdir && mkdir -p
$W/Extension/nlpsolver/help/qtz/com.sun.star.comp.Calc.NLPSolver/ &&
LD_LIBRARY_PATH="$I/program:$I/program" $W/LinkTarget/Executable/helpex -i
$S/nlpsolver/help/en/com.sun.star.comp.Calc.NLPSolver/Options.xhp -o
$W/Extension/nlpsolver/help/qtz/com.sun.star.comp.Calc.NLPSolver/Options.xhp -l
qtz -m && touch $W/Extension/nlpsolver/root/help/qtz-xhp.done
> ~/lo/core/workdir/LinkTarget/Executable/helpex: /lib64/libstdc++.so.6:
version `GLIBCXX_3.4.29' not found (required by
~/lo/core/workdir/LinkTarget/Executable/helpex)
> ~/lo/core/workdir/LinkTarget/Executable/helpex: /lib64/libstdc++.so.6:
version `GLIBCXX_3.4.29' not found (required by
~/lo/core/instdir/program/libicuuc.so.68)
> ~/lo/core/workdir/LinkTarget/Executable/helpex: /lib64/libstdc++.so.6:
version `GLIBCXX_3.4.29' not found (required by
~/lo/core/instdir/program/libuno_sal.so.3)
> make: *** [~/lo/core/nlpsolver/Extension_nlpsolver.mk:29:
~/lo/core/workdir/Extension/nlpsolver/help/qtz/com.sun.star.comp.Calc.NLPSolver/Options.xhp]
Error 1
)
Change-Id: Ib096de1c71c7d0c6d016c68599b421a925bebaae
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107454
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk
index e069acf325f7..a79d3999d208 100644
--- a/solenv/gbuild/Extension.mk
+++ b/solenv/gbuild/Extension.mk
@@ -366,7 +366,7 @@ $(call gb_Extension_get_workdir,$(1))/help/$(5)/$(3) : \
$$(call gb_Helper_abbreviate_dirs, \
mkdir -p $$(dir $$@) && \
$(if $(filter qtz,$(5)), \
- $(gb_Extension_HELPEXCOMMAND) -i $$< -o $$@ -l $(5) -m \
+ $$(gb_Extension_HELPEXCOMMAND) -i $$< -o $$@ -l $(5) -m
\
, \
$(if $(filter-out en-US,$(5)), \
MERGEINPUT=`$(gb_MKTEMP)` && \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
