mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-07-15 04:05:15 +03:00
38 lines
1.3 KiB
Diff
38 lines
1.3 KiB
Diff
From 4a42b3c6971c9534b104f48f6d13db8630a97d2f Mon Sep 17 00:00:00 2001
|
|
From: Michael Cho <michael@michaelcho.dev>
|
|
Date: Thu, 31 Oct 2024 11:12:07 -0400
|
|
Subject: [PATCH] Fix build with ICU 76
|
|
|
|
Due to unicode-org/icu@199bc82, ICU 76 no longer adds `icu-uc` by
|
|
default. This causes linker errors for undefined symbols like
|
|
`icu_76::UnicodeString::doReplace(...)`, referenced from:
|
|
`zim::removeAccents(...)` in tools.cpp.o.
|
|
|
|
Meson will automatically flatten the dependencies list as documented
|
|
at https://mesonbuild.com/Reference-manual_functions.html#build_target
|
|
---
|
|
meson.build | 10 ++++++++--
|
|
1 file changed, 8 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/meson.build b/meson.build
|
|
index eeb899817..79e97f469 100644
|
|
--- a/meson.build
|
|
+++ b/meson.build
|
|
@@ -77,9 +77,15 @@ else
|
|
endif
|
|
|
|
if xapian_dep.found()
|
|
- icu_dep = dependency('icu-i18n', static:static_linkage)
|
|
+ icu_dep = [
|
|
+ dependency('icu-i18n', static:static_linkage),
|
|
+ dependency('icu-uc', static:static_linkage)
|
|
+ ]
|
|
else
|
|
- icu_dep = dependency('icu-i18n', required:false, static:static_linkage)
|
|
+ icu_dep = [
|
|
+ dependency('icu-i18n', required:false, static:static_linkage),
|
|
+ dependency('icu-uc', required:false, static:static_linkage)
|
|
+ ]
|
|
endif
|
|
|
|
gtest_dep = dependency('gtest', version: '>=1.10.0', main:true, fallback:['gtest', 'gtest_main_dep'], required:false)
|