blob: 5d239d542b135e170cf6872c3a989e3fb2814999 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
|
# HG changeset patch
# User Martin Weinelt <martin+mozilla@linuxlounge.net>
# Date 1747057716 0
# Node ID 1c2e812125e0f1ada57bbe606bf46fb7be9e9059
# Parent f2dc324ff88fea439d7c4c6a5ffd2ff327b5b377
Bug 1927380 - Update icu pkgconfig module lookup r=anba
After upgrading to icu76 the build started failing to look up symbols
from icu when using the --system-icu option. Updating the pkgconfig
lookups to also read the icu-uc pkgconfig fixes the build.
Differential Revision: https://phabricator.services.mozilla.com/D248707
diff --git a/js/moz.configure b/js/moz.configure
--- a/js/moz.configure
+++ b/js/moz.configure
@@ -1300,17 +1300,19 @@ system_lib_option(
)
@depends("--with-system-icu", when=use_pkg_config)
def enable_system_icu_option(enable_system_icu):
return enable_system_icu
-system_icu = pkg_check_modules("MOZ_ICU", "icu-i18n >= 73.1", when="--with-system-icu")
+system_icu = pkg_check_modules(
+ "MOZ_ICU", "icu-uc icu-i18n >= 76.1", when="--with-system-icu"
+)
@depends(enable_system_icu_option)
def in_tree_icu(system_icu):
return not system_icu
# Set MOZ_ICU_CFLAGS to an explicit empty value when --with-system-icu is *not* used,
|
