Skip to content

Commit 86dba54

Browse files
committed
feat(core): icu build fix 🙀
- trim some more files For: #9121
1 parent e5bb22a commit 86dba54

File tree

3 files changed

+33
-29
lines changed

3 files changed

+33
-29
lines changed

core/subprojects/packagefiles/icu/meson.build

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,10 @@ uconfig.set('UCONFIG_NO_FORMATTING', 1)
4343
uconfig.set('UCONFIG_NO_TRANSLITERATION', 1)
4444
uconfig.set('UCONFIG_NO_REGULAR_EXPRESSIONS', 0) # want these for transforms #7375
4545
uconfig.set('UCONFIG_NO_SERVICE', 1)
46+
uconfig.set('U_OVERRIDE_CXX_ALLOCATION', 1)
47+
uconfig.set('UCONFIG_NO_CONVERSION', 1)
48+
uconfig.set('UCONFIG_USE_WINDOWS_LCID_MAPPING_API', 0)
49+
4650

4751

4852
uconfig_local = configure_file(

core/subprojects/packagefiles/icu/source/common/meson.build

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,10 @@ sources = files(
7575
'stringpiece.cpp',
7676
'stringtriebuilder.cpp',
7777
'uarrsort.cpp',
78-
'ubidi.cpp',
78+
# 'ubidi.cpp',
7979
'ubidi_props.cpp',
80-
'ubidiln.cpp',
81-
'ubidiwrt.cpp',
80+
# 'ubidiln.cpp',
81+
# 'ubidiwrt.cpp',
8282
'ubrk.cpp',
8383
'ucase.cpp',
8484
'ucasemap.cpp',
@@ -91,29 +91,29 @@ sources = files(
9191
'uchriter.cpp',
9292
'ucln_cmn.cpp',
9393
'ucmndata.cpp',
94-
'ucnv.cpp',
95-
'ucnv2022.cpp',
96-
'ucnv_bld.cpp',
97-
'ucnv_cb.cpp',
98-
'ucnv_cnv.cpp',
99-
'ucnv_ct.cpp',
100-
'ucnv_err.cpp',
101-
'ucnv_ext.cpp',
102-
'ucnv_io.cpp',
103-
'ucnv_lmb.cpp',
104-
'ucnv_set.cpp',
105-
'ucnv_u16.cpp',
106-
'ucnv_u32.cpp',
107-
'ucnv_u7.cpp',
108-
'ucnv_u8.cpp',
109-
'ucnvbocu.cpp',
110-
'ucnvdisp.cpp',
111-
'ucnvhz.cpp',
112-
'ucnvisci.cpp',
113-
'ucnvlat1.cpp',
114-
'ucnvmbcs.cpp',
115-
'ucnvscsu.cpp',
116-
'ucnvsel.cpp',
94+
# 'ucnv.cpp',
95+
# 'ucnv2022.cpp',
96+
# 'ucnv_bld.cpp',
97+
# 'ucnv_cb.cpp',
98+
# 'ucnv_cnv.cpp',
99+
# 'ucnv_ct.cpp',
100+
# 'ucnv_err.cpp',
101+
# 'ucnv_ext.cpp',
102+
# 'ucnv_io.cpp',
103+
# 'ucnv_lmb.cpp',
104+
# 'ucnv_set.cpp',
105+
# 'ucnv_u16.cpp',
106+
# 'ucnv_u32.cpp',
107+
# 'ucnv_u7.cpp',
108+
# 'ucnv_u8.cpp',
109+
# 'ucnvbocu.cpp',
110+
# 'ucnvdisp.cpp',
111+
# 'ucnvhz.cpp',
112+
# 'ucnvisci.cpp',
113+
# 'ucnvlat1.cpp',
114+
# 'ucnvmbcs.cpp',
115+
# 'ucnvscsu.cpp',
116+
# 'ucnvsel.cpp',
117117
'ucol_swp.cpp',
118118
'ucptrie.cpp',
119119
'ucurr.cpp',
@@ -287,8 +287,8 @@ headers = files(
287287
'unicode/stringpiece.h',
288288
'unicode/stringtriebuilder.h',
289289
'unicode/symtable.h',
290-
'unicode/ubidi.h',
291-
'unicode/ubiditransform.h',
290+
# 'unicode/ubidi.h',
291+
# 'unicode/ubiditransform.h',
292292
'unicode/ubrk.h',
293293
'unicode/ucasemap.h',
294294
'unicode/ucat.h',

core/subprojects/packagefiles/icu/source/i18n/meson.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ sources = files(
5252
'dayperiodrules.cpp',
5353
'dcfmtsym.cpp',
5454
'decContext.cpp',
55-
'decNumber.cpp',
55+
# 'decNumber.cpp',
5656
'decimfmt.cpp',
5757
'displayoptions.cpp',
5858
'double-conversion-bignum-dtoa.cpp',

0 commit comments

Comments
 (0)