diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2018-09-22 17:30:36 +0200 |
|---|---|---|
| committer | Michael Stahl <Michael.Stahl@cib.de> | 2018-12-12 16:43:24 +0100 |
| commit | 94830aececf309dafbd5e0485ac3c9e3d3db14fd (patch) | |
| tree | f292577834080a3dd072fa5e9009fc8fd93fc535 /RepositoryExternal.mk | |
| parent | dbe0b3f46baed6e226b3835a3017b9610d46470b (diff) | |
external/harfbuzz's libharfbuzz.a links against icuuc library
buovjaga reported on IRC that his build (implicitly --without-system-harfbuzz
--without-system-icu) failed to link e.g. Library_vclplug_gtk3 due to harfbuzz
missing symbols from ICU, like
> /usr/bin/ld: /home/user/libreoffice/workdir/UnpackedTarball/harfbuzz/src/.libs/libharfbuzz.a(libharfbuzz_la-hb-icu.o): in function `hb_icu_unicode_decompose_compatibility(hb_unicode_funcs_t*, unsigned int, unsigned int*, void*)':
> /home/user/libreoffice/workdir/UnpackedTarball/harfbuzz/src/hb-icu.cc:334: undefined reference to `unorm2_getNFKDInstance_62'
[...]
It is not clear to me why Library_vclplug_gtk3 would actually use
libharfbuzz.a's hb_icu_unicode_decompose_compatibility (and for e.g. my builds,
it apparently doesn't), but in general libharfbuzz.a does depend on some symbols
from icuuc, so it is correct to add icuuc to the link when linking against
harfbuzz. (And "gb_LinkTarget_use_external,...,icuuc" conveniently only adds
libs for linking, and does not add C/C++ include file paths, which would not be
wanted here.)
(<https://gerrit.libreoffice.org/#/c/60882/> "Revert 'Add more more dependencies
to VCL makefiles'" was a false start trying to address the above issue.)
Change-Id: Ic8bcfa2aab185f8a9487d7787b4f22068e7cb481
Reviewed-on: https://gerrit.libreoffice.org/60898
Tested-by: Jenkins
Reviewed-by: Ilmari Lauhakangas <ilmari.lauhakangas@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Reviewed-on: https://gerrit.libreoffice.org/64725
Reviewed-by: Lionel Elie Mamane <lionel@mamane.lu>
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
Diffstat (limited to 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index ac962732c0c6..7e629a89cb34 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1534,6 +1534,7 @@ $(call gb_LinkTarget_set_include,$(1),\ $$(INCLUDE) \ ) $(call gb_LinkTarget_add_libs,$(1),$(HARFBUZZ_LIBS)) +$(call gb_LinkTarget_use_external,$(1),icuuc) $(call gb_LinkTarget_use_external_project,$(1),harfbuzz) endef |