Re: [Buildroot] [PATCH v3, 1/1] package/wayland-protocols: fix build without host-wayland

["Yann E. MORIN" <yann.morin.1998@free.fr>]

Fabrice, All,

On 2021-09-19 11:39 +0200, Fabrice Fontaine spake thusly:
> Don't require wayland-scanner if tests are disabled to avoid the
> following build failure raised since bump to version 1.23 in commit
> 7eedc9cc1e0c3cce1c18cb150157cb2346075b23:
> 
> Build-time dependency wayland-scanner found: NO (tried pkgconfig and cmake)
> 
> ../output-1/build/wayland-protocols-1.23/meson.build:11:0: ERROR: Dependency "wayland-scanner" not found, tried pkgconfig and cmake
> 
> Fixes:
>  - http://autobuild.buildroot.org/results/2744e50465a9cd9d3726d23298ad6c943ef49a21
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>

Applied to master, thanks.

Regards,
Yann E. MORIN.

> ---
> Changes v2 -> v3 (after review of Yann E. Morin):
>  - Remove host-wayland dependency which is only needed for tests
> 
> Changes v1 -> v2 (after review of Yann E. Morin):
>  - Use host-wayland dependency instead of wayland
> 
>  ...and-scanner-is-only-needed-for-tests.patch | 42 +++++++++++++++++++
>  1 file changed, 42 insertions(+)
>  create mode 100644 package/wayland-protocols/0001-meson.build-wayland-scanner-is-only-needed-for-tests.patch
> 
> diff --git a/package/wayland-protocols/0001-meson.build-wayland-scanner-is-only-needed-for-tests.patch b/package/wayland-protocols/0001-meson.build-wayland-scanner-is-only-needed-for-tests.patch
> new file mode 100644
> index 0000000000..ff3ec5719c
> --- /dev/null
> +++ b/package/wayland-protocols/0001-meson.build-wayland-scanner-is-only-needed-for-tests.patch
> @@ -0,0 +1,42 @@
> +From 80e97bd00bf6263845aa98b411507baba28be67e Mon Sep 17 00:00:00 2001
> +From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> +Date: Sun, 19 Sep 2021 11:01:00 +0200
> +Subject: [PATCH] meson.build: wayland-scanner is only needed for tests
> +
> +wayland-scanner is only needed for tests so don't require it if tests
> +are disabled
> +
> +Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> +[Retrieved from:
> +https://gitlab.freedesktop.org/wayland/wayland-protocols/-/commit/80e97bd00bf6263845aa98b411507baba28be67e]
> +---
> + meson.build       | 2 --
> + tests/meson.build | 1 +
> + 2 files changed, 1 insertion(+), 2 deletions(-)
> +
> +diff --git a/meson.build b/meson.build
> +index 94b49e7..15dbc37 100644
> +--- a/meson.build
> ++++ b/meson.build
> +@@ -8,8 +8,6 @@ wayland_protocols_version = meson.project_version()
> + 
> + fs = import('fs')
> + 
> +-dep_scanner = dependency('wayland-scanner', native: true)
> +-
> + stable_protocols = [
> + 	'presentation-time',
> + 	'viewporter',
> +diff --git a/tests/meson.build b/tests/meson.build
> +index 66337e7..74824ae 100644
> +--- a/tests/meson.build
> ++++ b/tests/meson.build
> +@@ -1,4 +1,5 @@
> + prog_scan_sh = find_program('scan.sh')
> ++dep_scanner = dependency('wayland-scanner', native: true)
> + prog_scanner = find_program(dep_scanner.get_pkgconfig_variable('wayland_scanner'))
> + 
> + libwayland = [
> +-- 
> +GitLab
> +
> -- 
> 2.33.0
> 
> _______________________________________________
> buildroot mailing list
> buildroot@lists.buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@lists.buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot