organicmaps/harfbuzz
13
Fork 0
mirror of https://github.com/harfbuzz/harfbuzz.git synced 2025-04-05 13:35:06 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 9

[meson] Add back with_libstdcxx build option

Browse source 
Building harfbuzz when targeting Android API<=20 would need libstdc++
due to lack of uselocale and freelocale in C library but present in
libstdc++.

This reverts commit 0151da23d6.
This commit is contained in:
chitao1234 2024-08-23 11:29:34 +08:00 • committed by خالد حسني (Khaled Hosny)
parent 242b584405
commit 700ef11c9b
2 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
meson_options.txt
View file

@ -40,6 +40,8 @@ option('benchmark', type: 'feature', value: 'disabled',
description: 'Enable benchmark tests')
option('icu_builtin', type: 'boolean', value: false,
description: 'Don\'t separate ICU support as harfbuzz-icu module')
option('with_libstdcxx', type: 'boolean', value: false,
description: 'Allow linking with libstdc++')
option('experimental_api', type: 'boolean', value: false,
description: 'Enable experimental APIs')
option('ragel_subproject', type: 'boolean', value: false,

20
src/meson.build
View file

@ -450,7 +450,13 @@ hb_headers = hb_base_headers
harfbuzz_deps = [thread_dep, m_dep] + harfbuzz_extra_deps
libharfbuzz_link_language = 'c'
if get_option('with_libstdcxx')
chosen_linker = 'cpp'
else
# Use a C linker, not C++; Don't link to libstdc++
chosen_linker = 'c'
endif
libharfbuzz_link_language = chosen_linker
if conf.get('HAVE_FREETYPE', 0) == 1
hb_sources += hb_ft_sources
@ -551,8 +557,8 @@ hb_supported_features_h = configure_file(input: 'hb-features.h.in',
configuration: hb_supported_features,
install: false)
# Base and default-included sources and headers
# Base and default-included sources and headers
gen_def = find_program('gen-def.py')
gen_def_cmd = [gen_def, '@OUTPUT@', '@INPUT@']
if get_option('experimental_api')
@ -621,7 +627,7 @@ libharfbuzz_subset = library('harfbuzz-subset', hb_subset_sources,
version: version,
install: true,
darwin_versions: darwin_versions,
link_language: 'c',
link_language: chosen_linker,
)
custom_target('harfbuzz-subset.cc',
@ -661,7 +667,7 @@ if conf.get('HAVE_CAIRO', 0) == 1
version: version,
install: true,
darwin_versions: darwin_versions,
link_language: 'c',
link_language: chosen_linker,
)
install_headers(hb_cairo_headers, subdir: meson.project_name())
@ -780,7 +786,7 @@ if have_icu and not have_icu_builtin
install: true,
darwin_versions: darwin_versions,
# ICU links to stdc++ anyway so the default linker is good
# link_language: 'c',
# link_language: chosen_linker,
)
libharfbuzz_icu_dep = declare_dependency(
@ -947,7 +953,7 @@ if have_gobject
version: version,
install: true,
darwin_versions: darwin_versions,
link_language: 'c',
link_language: chosen_linker,
)
gir = find_program('g-ir-scanner', required: get_option('introspection'))
@ -1025,7 +1031,7 @@ if get_option('tests').enabled()
if cpp.get_argument_syntax() != 'msvc' and not meson.is_cross_build() # ensure the local tools are usable
dist_check_script += ['check-static-inits', 'check-symbols']
if get_option('wasm').disabled()
if get_option('wasm').disabled() and not get_option('with_libstdcxx')
dist_check_script += ['check-libstdc++']
endif
endif