Commit bbdb6890 authored by Matthias Clasen's avatar Matthias Clasen

Revert "meson: Change introspection option to yielding feature"

This reverts commit 82cfabba.

This change broke GTK ci, and it takes more work to fix it than
I can invest atm. We can try again when GTK is ready for it.
parent cb925c52
Pipeline #217511 passed with stages
in 2 minutes and 16 seconds
......@@ -40,7 +40,7 @@ asan-build:
needs: []
variables:
script:
- CC=clang meson --buildtype=debugoptimized -Db_sanitize=address -Db_lundef=false -Dintrospection=disabled _build
- CC=clang meson --buildtype=debugoptimized -Db_sanitize=address -Db_lundef=false -Dintrospection=false _build
- ninja -C _build
- .gitlab-ci/run-tests.sh _build
allow_failure: true
......
......@@ -4,9 +4,8 @@ option('gtk_doc',
value: false)
option('introspection',
description: 'Build the GObject introspection data for Pango',
type: 'feature',
value: 'auto',
yield: true)
type: 'boolean',
value: true)
option('install-tests',
description : 'Install tests',
type: 'boolean',
......
......@@ -121,8 +121,7 @@ libpango = library(
pango_dep_sources = [pango_enum_h]
gir = find_program('g-ir-scanner', required : get_option('introspection'))
build_gir = gir.found() and (not meson.is_cross_build() or get_option('introspection').enabled())
build_gir = get_option('introspection')
if build_gir
gir_args = [
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment