From c79327cf316b5ff6550aa64e871d4818dca87bae Mon Sep 17 00:00:00 2001 From: satk0 Date: Tue, 28 Jan 2025 12:23:59 +0100 Subject: [PATCH] Make subproject yield options --- shlr/meson.build | 3 +-- subprojects/packagefiles/capstone-v5/meson_options.txt | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/shlr/meson.build b/shlr/meson.build index 335378188550a..c97079fb0f17d 100644 --- a/shlr/meson.build +++ b/shlr/meson.build @@ -24,8 +24,7 @@ else 'fix-x86-16.patch', ] elif capstone_version == 'v5' - opts = 'plugins='+get_option('plugins') - cs = subproject('capstone-v5', default_options: [opts]) + cs = subproject('capstone-v5') patches_files = [ 'fix-x86-16.patch' ] diff --git a/subprojects/packagefiles/capstone-v5/meson_options.txt b/subprojects/packagefiles/capstone-v5/meson_options.txt index d75ee7ccb718c..f30bea7164973 100644 --- a/subprojects/packagefiles/capstone-v5/meson_options.txt +++ b/subprojects/packagefiles/capstone-v5/meson_options.txt @@ -1,2 +1,2 @@ -option('plugins', type: 'string', value: '', description: 'Comma separated list of plugin names') +option('plugins', type: 'string', value: '', description: 'Comma separated list of plugin names', yield: true)