Skip to content

Commit

Permalink
[meson] fix icu-related linking errors in test with amalgam build
Browse files Browse the repository at this point in the history
test-unicode.c:960: undefined reference to `hb_icu_get_unicode_funcs'
test-unicode.c:961: undefined reference to `hb_icu_get_unicode_funcs'

For now add the icu sources to libharfbuzz also for the amalgam
build, later we need to have a separate harfbuzz-icu module and
link against that, and/or generate harfbuzz.cc.
  • Loading branch information
tp-m authored and ebraminio committed Mar 14, 2020
1 parent a3892be commit 93b3e30
Showing 1 changed file with 6 additions and 5 deletions.
11 changes: 6 additions & 5 deletions src/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -185,11 +185,6 @@ if conf.get('HAVE_GLIB', 0) == 1
hb_headers += hb_glib_headers
endif

if conf.get('HAVE_ICU', 0) == 1
hb_sources += hb_icu_sources
hb_headers += hb_icu_headers
endif

if conf.get('HAVE_UNISCRIBE', 0) == 1
hb_sources += ['hb-uniscribe.cc']
hb_headers += ['hb-uniscribe.h']
Expand All @@ -210,6 +205,12 @@ if get_option('amalgam')
hb_sources = ['harfbuzz.cc']
endif

# FIXME: move into harfbuzz-icu module
if conf.get('HAVE_ICU', 0) == 1
hb_sources += hb_icu_sources
hb_headers += hb_icu_headers
endif

# harfbuzz
gen_def = find_program('gen-def.py')
harfbuzz_def = custom_target('harfbuzz.def',
Expand Down

0 comments on commit 93b3e30

Please sign in to comment.