diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2020-12-09 09:36:33 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2020-12-09 14:17:31 +0100 |
| commit | ae3dcef7049d3dd8ca171909c66ddb5d74ce9f94 (patch) | |
| tree | b473c110ce71bbf9e11d80f443d85450433b24a2 | |
| parent | dbce9c45f5b59e69eac580f0931a39dabae25a81 (diff) | |
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 <sbergman@redhat.com>
| -rw-r--r-- | solenv/gbuild/Extension.mk | 2 |
1 files changed, 1 insertions, 1 deletions
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)` && \ |