* Re: [Buildroot] [PATCH v2, 1/1] package/wayland-protocols: add host-wayland dependency
2021-09-19 8:36 [Buildroot] [PATCH v2, 1/1] package/wayland-protocols: add host-wayland dependency Fabrice Fontaine
@ 2021-09-19 8:56 ` Yann E. MORIN
0 siblings, 0 replies; 2+ messages in thread
From: Yann E. MORIN @ 2021-09-19 8:56 UTC (permalink / raw)
To: Fabrice Fontaine; +Cc: Thomas Petazzoni, buildroot
Fabrice, All,
On 2021-09-19 10:36 +0200, Fabrice Fontaine spake thusly:
> host-wayland is needed 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>
So, you were too fast respinning this. ;-) I was looking at the code for
wayland-protocols, and wayland-scanner is only needed for the tests:
$ grep -r dep_scanner .
./tests/meson.build:prog_scanner = find_program(dep_scanner.get_pkgconfig_variable('wayland_scanner'))
./meson.build:dep_scanner = dependency('wayland-scanner', native: true)
And we explicitly disable tests, so it would be too bad to add a
dependency for something that is not used...
Probably, we should patch it out, like:
--- meson.build.orig 2021-09-19 10:54:11.685408228 +0200
+++ meson.build 2021-09-19 10:54:13.321430159 +0200
@@ -8,8 +8,6 @@
fs = import('fs')
-dep_scanner = dependency('wayland-scanner', native: true)
-
stable_protocols = [
'presentation-time',
'viewporter',
@@ -116,5 +114,6 @@
meson.override_dependency('wayland-protocols', wayland_protocols)
if get_option('tests')
+ dep_scanner = dependency('wayland-scanner', native: true)
subdir('tests')
endif
Can you look into that?
Regards,
Yann E. MORIN.
> ---
> Changes v1 -> v2 (after review of Yann E. Morin):
> - Use host-wayland dependency instead of wayland
>
> package/wayland-protocols/wayland-protocols.mk | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/package/wayland-protocols/wayland-protocols.mk b/package/wayland-protocols/wayland-protocols.mk
> index 41ab1e1c99..ea1639ea2d 100644
> --- a/package/wayland-protocols/wayland-protocols.mk
> +++ b/package/wayland-protocols/wayland-protocols.mk
> @@ -11,6 +11,7 @@ WAYLAND_PROTOCOLS_LICENSE = MIT
> WAYLAND_PROTOCOLS_LICENSE_FILES = COPYING
> WAYLAND_PROTOCOLS_INSTALL_STAGING = YES
> WAYLAND_PROTOCOLS_INSTALL_TARGET = NO
> +WAYLAND_PROTOCOLS_DEPENDENCIES = host-wayland
>
> WAYLAND_PROTOCOLS_CONF_OPTS = -Dtests=false
>
> --
> 2.33.0
>
--
.-----------------.--------------------.------------------.--------------------.
| 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
^ permalink raw reply [flat|nested] 2+ messages in thread