[Git][freetype/freetype][master] [meson] Remove `default_library=both` from `default_options`.

[Werner Lemberg (@wl)]

Werner Lemberg pushed to branch master at FreeType / FreeType

Commits:

• d59c7ce1
  by Xavier Claessens at 2022-04-24T17:01:56+02:00

  [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.
  

2 changed files:

• .gitlab-ci.yml
• meson.build

Changes:

.gitlab-ci.yml

---

...	...	@@ -5,7 +5,7 @@ stages:
5	5
6	6	# FIXME: Use --werror once warnings are fixed.
7	7	variables:
8		- MESON_ARGS: --fatal-meson-warnings
	8	+ MESON_ARGS: --fatal-meson-warnings --default-library=both
9	9	MESON_ARGS_WINDOWS: ${MESON_ARGS} --force-fallback-for="">
10	10
11	11	.build windows common:
...	...	@@ -147,7 +147,8 @@ linux autotools libs clang:
147	147	linux meson:
148	148	extends: '.build linux common'
149	149	script: |
150		- meson setup build -Dbrotli=disabled \
	150	+ meson setup build ${MESON_ARGS} \
	151	+ -Dbrotli=disabled \
151	152	-Dbzip2=disabled \
152	153	-Dharfbuzz=disabled \
153	154	-Dpng=disabled \
...	...	@@ -159,7 +160,8 @@ linux meson:
159	160	linux meson libs:
160	161	extends: '.build linux common'
161	162	script: |
162		- meson setup build -Dbrotli=enabled \
	163	+ meson setup build ${MESON_ARGS} \
	164	+ -Dbrotli=enabled \
163	165	-Dbzip2=enabled \
164	166	-Dharfbuzz=disabled \
165	167	-Dpng=disabled \
...	...	@@ -222,7 +224,7 @@ macos meson:
222	224	- pip3 install -U meson
223	225	- pip3 install --upgrade certifi
224	226	- pip3 install -U ninja
225		-
226		- - meson setup build
	227	+
	228	+ - meson setup build ${MESON_ARGS}
227	229	- meson compile --verbose -C build
228	230	- sudo meson install -C build

meson.build

---

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

—
View it on GitLab.
You're receiving this email because of your account on gitlab.freedesktop.org. If you'd like to receive fewer emails, you can adjust your notification settings.