diff mbox series

[v6,23/23] build-sys: make pixman actually optional

Message ID 20231025190818.3278423-24-marcandre.lureau@redhat.com
State Handled Elsewhere
Headers show
Series Make Pixman an optional dependency | expand

Commit Message

Marc-André Lureau Oct. 25, 2023, 7:08 p.m. UTC 
From: Marc-André Lureau <marcandre.lureau@redhat.com>

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
 meson.build | 3 ---
 1 file changed, 3 deletions(-)

Comments

Thomas Huth Oct. 26, 2023, 5:42 a.m. UTC | #1 
On 25/10/2023 21.08, marcandre.lureau@redhat.com wrote:
> From: Marc-André Lureau <marcandre.lureau@redhat.com>
> 
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> ---
>   meson.build | 3 ---
>   1 file changed, 3 deletions(-)
> 
> diff --git a/meson.build b/meson.build
> index ad1e0155ee..a35cd860aa 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -817,9 +817,6 @@ if not get_option('pixman').auto() or have_system or have_tools
>     pixman = dependency('pixman-1', required: get_option('pixman'), version:'>=0.21.8',
>                         method: 'pkg-config')
>   endif
> -if not pixman.found() and (have_system or have_tools)
> -  error('FIXME: pixman is currently required')
> -endif
>   
>   zlib = dependency('zlib', required: true)
>   

Reviewed-by: Thomas Huth <thuth@redhat.com>
diff mbox series

Patch

diff --git a/meson.build b/meson.build
index ad1e0155ee..a35cd860aa 100644
--- a/meson.build
+++ b/meson.build
@@ -817,9 +817,6 @@  if not get_option('pixman').auto() or have_system or have_tools
   pixman = dependency('pixman-1', required: get_option('pixman'), version:'>=0.21.8',
                       method: 'pkg-config')
 endif
-if not pixman.found() and (have_system or have_tools)
-  error('FIXME: pixman is currently required')
-endif
 
 zlib = dependency('zlib', required: true)