[meson] Remove default_library=both from default_options.

It is inconsistent with what all other Meson projects do.

It also prevents static linking to FreeType when it is a subproject because
`default_options` in a subproject takes precedence on values set on the main
project.  For example, building 'GStreamer' with `-Ddefault_library=static`
would still dynamically link on FreeType unless the user also sets
`-Dfreetype2:default_library=static`.

* meson.build: Updated.

* .gitlab-ci.yml: Retain `both` option for testing.
This commit is contained in:
Xavier Claessens
2022-04-21 08:43:18 -04:00
committed by Werner Lemberg
parent 079a22da03
commit d59c7ce1b9
2 changed files with 7 additions and 6 deletions

View File

@@ -25,7 +25,6 @@
project('freetype2', 'c',
meson_version: '>= 0.55.0',
default_options: ['default_library=both'],
version: run_command('builds/meson/extract_freetype_version.py',
'include/freetype/freetype.h',
check: true).stdout().strip(),