walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[meson] specify preferred linker to avoid stdc++ linking

This commit is contained in:
Ebrahim Byagowi 2020-05-10 14:20:27 +04:30
parent 15083c24ee
commit 2ac4222022
2 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meson_options.txt
View File

@ -28,6 +28,8 @@ option('introspection', type : 'feature', value : 'disabled', yield : true,
option('icu-builtin', type: 'boolean', value: false, option('icu-builtin', type: 'boolean', value: false,
description: 'Don\'t separate ICU support as harfbuzz-icu module') description: 'Don\'t separate ICU support as harfbuzz-icu module')
option('with-libstdcxx', type: 'boolean', value: false,
description: 'Allow linking with libstdc++ (ignored and always enabled in Windows)')
option('experimental-api', type: 'boolean', value: false, option('experimental-api', type: 'boolean', value: false,
description: 'Enable experimental APIs') description: 'Enable experimental APIs')
option('amalgam', type : 'boolean', value : false, option('amalgam', type : 'boolean', value : false,

19
src/meson.build
View File

@ -334,6 +334,16 @@ if have_icu and have_icu_builtin
deps += [icu_dep] deps += [icu_dep]
endif endif
if host_machine.system() == 'windows' or get_option('with-libstdcxx')
chosen_linker = 'cpp'
else
# our autotools port was limiting this to HAVE_GCC as https://github.com/harfbuzz/harfbuzz/commit/e784632
# let's see if that is needed anymore
# Use a C linker, not C++; Don't link to libstdc++
chosen_linker = 'c'
endif
# harfbuzz # harfbuzz
gen_def = find_program('gen-def.py') gen_def = find_program('gen-def.py')
@ -369,6 +379,7 @@ libharfbuzz = library('harfbuzz', hb_sources,
soversion: hb_so_version, soversion: hb_so_version,
version: version, version: version,
install: true, install: true,
link_language: chosen_linker,
name_prefix: hb_lib_prefix) name_prefix: hb_lib_prefix)
libharfbuzz_dep = declare_dependency( libharfbuzz_dep = declare_dependency(
@ -390,6 +401,7 @@ libharfbuzz_subset = library('harfbuzz-subset', hb_subset_sources,
soversion: hb_so_version, soversion: hb_so_version,
version: version, version: version,
install: true, install: true,
link_language: chosen_linker,
name_prefix: hb_lib_prefix) name_prefix: hb_lib_prefix)
libharfbuzz_subset_dep = declare_dependency( libharfbuzz_subset_dep = declare_dependency(
@ -471,7 +483,9 @@ if get_option('tests').enabled()
if not get_option('amalgam') if not get_option('amalgam')
dist_check_script += 'check-includes.sh' dist_check_script += 'check-includes.sh'
endif endif
if false # !WITH_LIBSTDCXX if false and not get_option('with-libstdcxx')
# enable this once https://github.com/mesonbuild/meson/pull/6838 hits a release
# and make that version (i.e. 0.55) our minimum build requirement
dist_check_script += 'check-libstdc++.sh' # See https://github.com/harfbuzz/harfbuzz/issues/2276 dist_check_script += 'check-libstdc++.sh' # See https://github.com/harfbuzz/harfbuzz/issues/2276
endif endif
@ -515,6 +529,8 @@ if have_icu and not have_icu_builtin
soversion: hb_so_version, soversion: hb_so_version,
version: version, version: version,
install: true, install: true,
# ICU links to stdc++ anyway so the default linker is good
# link_language: chosen_linker,
name_prefix: hb_lib_prefix) name_prefix: hb_lib_prefix)
libharfbuzz_icu_dep = declare_dependency( libharfbuzz_icu_dep = declare_dependency(
@ -598,6 +614,7 @@ if have_gobject
soversion: hb_so_version, soversion: hb_so_version,
version: version, version: version,
install: true, install: true,
link_language: chosen_linker,
name_prefix: hb_lib_prefix) name_prefix: hb_lib_prefix)
gir = find_program('g-ir-scanner', required: get_option('introspection')) gir = find_program('g-ir-scanner', required: get_option('introspection'))