[Libreoffice-commits] core.git: vcl/CppunitTest_vcl_text.mk

[Rene Engelhard (via logerrit)]

 vcl/CppunitTest_vcl_text.mk |   11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

New commits:
commit a866d63e0ac9de4ff7e59b3928f09ec21877bef3
Author:     Rene Engelhard <rene at debian.org>
AuthorDate: Sun Aug 29 21:05:39 2021 +0200
Commit:     Tomaž Vajngerl <quikee at gmail.com>
CommitDate: Tue Aug 31 01:35:00 2021 +0200

    fix build
    
    CppunitTest_vcl_text needs icuuc now, not only icu headers
    
    /usr/bin/ld: /home/rene/LibreOffice/git/master/workdir/CxxObject/vcl/qa/cppunit/text.o: in function `vcl::ScriptRun::~ScriptRun()':
    ././vcl/inc/scrptrun.h:61: undefined reference to `icu_67::UObject::~UObject()'
    /usr/bin/ld: /home/rene/LibreOffice/git/master/workdir/CxxObject/vcl/qa/cppunit/text.o: in function `vcl::ScriptRun::~ScriptRun()':
    ././vcl/inc/scrptrun.h:61: undefined reference to `icu_67::UObject::~UObject()'
    /usr/bin/ld: /home/rene/LibreOffice/git/master/workdir/CxxObject/vcl/qa/cppunit/text.o: in function `vcl::ScriptRun::~ScriptRun()':
    ././vcl/inc/scrptrun.h:61: undefined reference to `icu_67::UMemory::operator delete(void*)'
    /usr/bin/ld: /home/rene/LibreOffice/git/master/workdir/CxxObject/vcl/qa/cppunit/text.o: in function `vcl::ScriptRun::~ScriptRun()':
    ././vcl/inc/scrptrun.h:61: undefined reference to `icu_67::UObject::~UObject()'
    /usr/bin/ld: /home/rene/LibreOffice/git/master/workdir/CxxObject/vcl/qa/cppunit/text.o: in function `vcl::ScriptRun::ScriptRun(char16_t const*, int)':
    ././vcl/inc/scrptrun.h:116: undefined reference to `icu_67::UObject::~UObject()'
    /usr/bin/ld: /home/rene/LibreOffice/git/master/workdir/CxxObject/vcl/qa/cppunit/text.o:(.data.rel.ro._ZTIN3vcl9ScriptRunE[_ZTIN3vcl9ScriptRunE]+0x8): undefined reference to `typeinfo for icu_67::UObject'
    collect2: error: ld returned 1 exit status
    make[4]: *** [/home/rene/LibreOffice/git/master/solenv/gbuild/LinkTarget.mk:731: /home/rene/LibreOffice/git/master/workdir/LinkTarget/CppunitTest/libtest_vcl_text.so] Error 1
    make[4]: *** Waiting for unfinished jobs.
    
    Change-Id: I3e94e0f97694c99c6388f6268054fe1c57a881cb
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121240
    Reviewed-by: Chris Sherlock <chris.sherlock79 at gmail.com>
    Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>
    Tested-by: Jenkins

diff --git a/vcl/CppunitTest_vcl_text.mk b/vcl/CppunitTest_vcl_text.mk
index ffc307e094f1..4ffa3b1990ca 100644
--- a/vcl/CppunitTest_vcl_text.mk
+++ b/vcl/CppunitTest_vcl_text.mk
@@ -23,9 +23,18 @@ $(eval $(call gb_CppunitTest_add_exception_objects,vcl_text, \
 $(eval $(call gb_CppunitTest_use_externals,vcl_text,\
 	boost_headers \
 	harfbuzz \
-	icu_headers \
 ))
 
+ifeq ($(SYSTEM_ICU),TRUE)
+$(eval $(call gb_CppunitTest_use_externals,vcl_text,\
+	icuuc \
+))
+else
+$(eval $(call gb_CppunitTest_use_externals,vcl_text,\
+        icu_headers \
+))
+endif
+
 $(eval $(call gb_CppunitTest_use_libraries,vcl_text, \
 	comphelper \
 	cppu \