diff mbox series

[v4,03/11] capstone: Require version 4.0 from a system library

Message ID 20200921174118.39352-4-richard.henderson@linaro.org
State New
Headers show
Series capstone + disassembler patches | expand

Commit Message

Richard Henderson Sept. 21, 2020, 5:41 p.m. UTC
We're about to use a portion of the 4.0 API.
Reject a system library version prior to that.

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
 meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Alex Bennée Sept. 21, 2020, 7:19 p.m. UTC | #1
Richard Henderson <richard.henderson@linaro.org> writes:

> We're about to use a portion of the 4.0 API.
> Reject a system library version prior to that.
>
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>

Tested-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>

> ---
>  meson.build | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meson.build b/meson.build
> index 4c92b43fe5..114b136129 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -613,7 +613,7 @@ if capstone_opt == 'no'
>    capstone_opt = false
>  elif capstone_opt in ['yes', 'auto', 'system']
>    have_internal = fs.exists('capstone/Makefile')
> -  capstone = dependency('capstone', static: enable_static,
> +  capstone = dependency('capstone', version: '>=4.0', static: enable_static,
>                          required: capstone_opt == 'system' or
>                                    capstone_opt == 'yes' and not have_internal)
>    if capstone.found()
Philippe Mathieu-Daudé Sept. 22, 2020, 10:33 a.m. UTC | #2
On 9/21/20 7:41 PM, Richard Henderson wrote:
> We're about to use a portion of the 4.0 API.
> Reject a system library version prior to that.
> 
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>

> ---
>  meson.build | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/meson.build b/meson.build
> index 4c92b43fe5..114b136129 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -613,7 +613,7 @@ if capstone_opt == 'no'
>    capstone_opt = false
>  elif capstone_opt in ['yes', 'auto', 'system']
>    have_internal = fs.exists('capstone/Makefile')
> -  capstone = dependency('capstone', static: enable_static,
> +  capstone = dependency('capstone', version: '>=4.0', static: enable_static,
>                          required: capstone_opt == 'system' or
>                                    capstone_opt == 'yes' and not have_internal)
>    if capstone.found()
>
diff mbox series

Patch

diff --git a/meson.build b/meson.build
index 4c92b43fe5..114b136129 100644
--- a/meson.build
+++ b/meson.build
@@ -613,7 +613,7 @@  if capstone_opt == 'no'
   capstone_opt = false
 elif capstone_opt in ['yes', 'auto', 'system']
   have_internal = fs.exists('capstone/Makefile')
-  capstone = dependency('capstone', static: enable_static,
+  capstone = dependency('capstone', version: '>=4.0', static: enable_static,
                         required: capstone_opt == 'system' or
                                   capstone_opt == 'yes' and not have_internal)
   if capstone.found()