mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-30 22:26:42 +00:00
harfbuzz: fix build after 5.2.0 update
- seems like the ICU detection broken now and pulls ins system ICU files which leads to `HAVE_ICU` defined and ends up with a broken build ``` [69/79] Compiling C++ object src/libharfbuzz-icu.so.0.50200.0.p/hb-icu.cc.o FAILED: src/libharfbuzz-icu.so.0.50200.0.p/hb-icu.cc.o /mnt/build/LibreELEC-RR/build.LibreELEC-x11.x86_64-11.0-devel/toolchain/bin/x86_64-libreelec-linux-gnu-g++ -Isrc/libharfbuzz-icu.so.0.50200.0.p -Isrc -I../src -I. -I.. -I/usr/include -fdiagnostics-color=always -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wnon-virtual-dtor -std=c++11 -fno-rtti -O0 -fno-exceptions -fno-rtti -fno-threadsafe-statics -fvisibility-inlines-hidden -DHAVE_CONFIG_H -march=x86-64-v2 -Wall -pipe -O2 -fomit-frame-pointer -DNDEBUG -fPIC -Wno-non-virtual-dtor -MD -MQ src/libharfbuzz-icu.so.0.50200.0.p/hb-icu.cc.o -MF src/libharfbuzz-icu.so.0.50200.0.p/hb-icu.cc.o.d -o src/libharfbuzz-icu.so.0.50200.0.p/hb-icu.cc.o -c ../src/hb-icu.cc CROSS COMPILE Badness: /usr/include in INCLUDEPATH: /usr/include cc1plus: internal compiler error: in add_path, at incpath.cc:481 0x6b83d4 _start ../sysdeps/x86_64/start.S:115 Please submit a full bug report, with preprocessed source (by using -freport-bug). Please include the complete backtrace with any bug report. See <https://gcc.gnu.org/bugs/> for instructions. ```
This commit is contained in:
parent
1ec1043915
commit
6de3ece383
@ -0,0 +1,12 @@
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -109,7 +109,7 @@
|
||||
if not icu_dep.found()
|
||||
# Try cmake name
|
||||
icu_dep = dependency('ICU',
|
||||
- required: false,
|
||||
+ required: get_option('icu'),
|
||||
components: 'uc',
|
||||
method: 'cmake')
|
||||
endif
|
||||
|
Loading…
x
Reference in New Issue
Block a user