meson.build: support building with ICU 76
ICU 76 decided to reduce overlinking[^1] thus `icu-i18n` will no longer
add `icu-uc` when linking to shared libraries. This results in failure:
```
src/lib/icu/libicu.a.p/Converter.cxx.o: undefined reference to symbol 'ucnv_fromUnicode_76'
```
[^1]: 199bc82702
Closes https://github.com/MusicPlayerDaemon/MPD/issues/2151
This commit is contained in:

committed by
Max Kellermann

parent
9d2666f293
commit
4a49f75799
1
NEWS
1
NEWS
@@ -1,5 +1,6 @@
|
|||||||
ver 0.23.16 (not yet released)
|
ver 0.23.16 (not yet released)
|
||||||
* support libfmt 11
|
* support libfmt 11
|
||||||
|
* support ICU 76
|
||||||
|
|
||||||
ver 0.23.15 (2023/12/20)
|
ver 0.23.15 (2023/12/20)
|
||||||
* decoder
|
* decoder
|
||||||
|
@@ -1,5 +1,7 @@
|
|||||||
icu_dep = dependency('icu-i18n', version: '>= 50', required: get_option('icu'))
|
icu_i18n_dep = dependency('icu-i18n', version: '>= 50', required: get_option('icu'))
|
||||||
conf.set('HAVE_ICU', icu_dep.found())
|
icu_uc_dep = dependency('icu-uc', version: '>= 50', required: get_option('icu'))
|
||||||
|
have_icu = icu_i18n_dep.found() and icu_uc_dep.found()
|
||||||
|
conf.set('HAVE_ICU', have_icu)
|
||||||
|
|
||||||
icu_sources = [
|
icu_sources = [
|
||||||
'CaseFold.cxx',
|
'CaseFold.cxx',
|
||||||
@@ -13,7 +15,7 @@ if is_windows
|
|||||||
endif
|
endif
|
||||||
|
|
||||||
iconv_dep = []
|
iconv_dep = []
|
||||||
if icu_dep.found()
|
if have_icu
|
||||||
icu_sources += [
|
icu_sources += [
|
||||||
'Util.cxx',
|
'Util.cxx',
|
||||||
'Init.cxx',
|
'Init.cxx',
|
||||||
@@ -44,7 +46,8 @@ icu = static_library(
|
|||||||
icu_sources,
|
icu_sources,
|
||||||
include_directories: inc,
|
include_directories: inc,
|
||||||
dependencies: [
|
dependencies: [
|
||||||
icu_dep,
|
icu_i18n_dep,
|
||||||
|
icu_uc_dep,
|
||||||
iconv_dep,
|
iconv_dep,
|
||||||
fmt_dep,
|
fmt_dep,
|
||||||
],
|
],
|
||||||
|
Reference in New Issue
Block a user