[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - RepositoryExternal.mk

[Libreoffice Gerrit user]

 RepositoryExternal.mk |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 94830aececf309dafbd5e0485ac3c9e3d3db14fd
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Sat Sep 22 17:30:36 2018 +0200
Commit:     Michael Stahl <Michael.Stahl at cib.de>
CommitDate: Wed Dec 12 16:43:24 2018 +0100

    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 at libreoffice.org>
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
    Reviewed-on: https://gerrit.libreoffice.org/64725
    Reviewed-by: Lionel Elie Mamane <lionel at mamane.lu>
    Reviewed-by: Michael Stahl <Michael.Stahl at cib.de>

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