Skip to contentSkip to conversation

package/wayland-protocols: add host-wayland dependency

PATCH In review Fabrice Fontaine 2 participants 2 messages Sep 19, 2021

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 package/wayland-protocols: add host-wayland dependency

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

---
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(+)
package/wayland-protocols/wayland-protocols.mk +1 -0
index 41ab1e1c99..ea1639ea2d 100644
@@ -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
 
Signature · 6 lines
2.33.0

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#1 lore raw

Fabrice, All,

On 2021-09-19 10:36 +0200, Fabrice Fontaine spake thusly:

Quoted 11 lines

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

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.

Quoted 22 lines

---
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(+)
package/wayland-protocols/wayland-protocols.mk +1 -0
index 41ab1e1c99..ea1639ea2d 100644
@@ -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
 
Signature · 1 line
2.33.0
Signature · 10 lines
.-----------------.--------------------.------------------.--------------------.
|  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
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot