summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeonardo Sandoval <leonardo.sandoval.gonzalez@linux.intel.com>2017-08-31 07:00:41 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-08-31 23:30:03 +0100
commit1f3e46b6a1d12a597aa9baf82c91db12a8513f67 (patch)
tree9e43904de6f4679a8643e4a812733dff6d11c271
parent133e8033092e16af935757c25ce7d85478ca65bf (diff)
downloadpoky-1f3e46b6a1d12a597aa9baf82c91db12a8513f67.tar.gz
waffle: fix REQUIRED_DISTRO_FEATURES and PACKAGECONFIG virtual/libgl dependencies
Waffle's REQUIRED_DISTRO_FEATURES statement looks into DEPENDS and if virtual/libgl is present, it includes opengl as distro feature. However, in a multilib environment, recipes provides virtual/${MLPREFIX}libgl, thus waffle recipe needs to include the prefix. Also PACKAGECONFIG statements need this change in order to properly include the libgl dependency. The way this error showed up was in a multilib environment and a distro not containing opengl, i.e. nodistro, leading the following error when building world -S none (because opengl was not included as required distro feature): ERROR: Nothing PROVIDES 'virtual/lib32-libgl' (but virtual:multilib:lib32:/meta/recipes-graphics/waffle/waffle_1.5.2.bb DEPENDS on or otherwise requires it). Close matches: virtual/lib32-libsdl virtual/lib32-libc virtual/lib32-libsdl2 ERROR: Required build target 'lib32-meta-world-pkgdata' has no buildable providers. Missing or unbuildable dependency chain was: ['lib32-meta-world-pkgdata', 'meta-world-pkgdata', 'lib32-waffle', 'virtual/lib32-libgl'] Summary: There were 2 ERROR messages shown, returning a non-zero exit code. [YOCTO #10900] (From OE-Core rev: 2e3344a3b6d5c709ab0d368dd171240ab5cc6e22) Signed-off-by: Leonardo Sandoval <leonardo.sandoval.gonzalez@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/waffle/waffle_1.5.2.bb10
1 files changed, 5 insertions, 5 deletions
diff --git a/meta/recipes-graphics/waffle/waffle_1.5.2.bb b/meta/recipes-graphics/waffle/waffle_1.5.2.bb
index 9d6b0e0e0d..a5179db1da 100644
--- a/meta/recipes-graphics/waffle/waffle_1.5.2.bb
+++ b/meta/recipes-graphics/waffle/waffle_1.5.2.bb
@@ -21,20 +21,20 @@ PACKAGECONFIG ??= "glx"
21REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('PACKAGECONFIG', 'glx', 'x11', '', d)}" 21REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('PACKAGECONFIG', 'glx', 'x11', '', d)}"
22 22
23# virtual/libgl requires opengl in DISTRO_FEATURES. 23# virtual/libgl requires opengl in DISTRO_FEATURES.
24REQUIRED_DISTRO_FEATURES += "${@bb.utils.contains('DEPENDS', 'virtual/libgl', 'opengl', '', d)}" 24REQUIRED_DISTRO_FEATURES += "${@bb.utils.contains('DEPENDS', 'virtual/${MLPREFIX}libgl', 'opengl', '', d)}"
25 25
26# I say virtual/libgl, actually wants gl.pc 26# I say virtual/libgl, actually wants gl.pc
27PACKAGECONFIG[glx] = "-Dwaffle_has_glx=1,-Dwaffle_has_glx=0,virtual/libgl libx11" 27PACKAGECONFIG[glx] = "-Dwaffle_has_glx=1,-Dwaffle_has_glx=0,virtual/${MLPREFIX}libgl libx11"
28 28
29# I say virtual/libgl, actually wants wayland-egl.pc, egl.pc, and the wayland 29# I say virtual/libgl, actually wants wayland-egl.pc, egl.pc, and the wayland
30# DISTRO_FEATURE. 30# DISTRO_FEATURE.
31PACKAGECONFIG[wayland] = "-Dwaffle_has_wayland=1,-Dwaffle_has_wayland=0,virtual/libgl wayland" 31PACKAGECONFIG[wayland] = "-Dwaffle_has_wayland=1,-Dwaffle_has_wayland=0,virtual/${MLPREFIX}libgl wayland"
32 32
33# I say virtual/libgl, actually wants gbm.pc egl.pc 33# I say virtual/libgl, actually wants gbm.pc egl.pc
34PACKAGECONFIG[gbm] = "-Dwaffle_has_gbm=1,-Dwaffle_has_gbm=0,virtual/libgl udev" 34PACKAGECONFIG[gbm] = "-Dwaffle_has_gbm=1,-Dwaffle_has_gbm=0,virtual/${MLPREFIX}libgl udev"
35 35
36# I say virtual/libgl, actually wants egl.pc 36# I say virtual/libgl, actually wants egl.pc
37PACKAGECONFIG[x11-egl] = "-Dwaffle_has_x11_egl=1,-Dwaffle_has_x11_egl=0,virtual/libgl libxcb" 37PACKAGECONFIG[x11-egl] = "-Dwaffle_has_x11_egl=1,-Dwaffle_has_x11_egl=0,virtual/${MLPREFIX}libgl libxcb"
38 38
39FILES_${PN}-dev += "${datadir}/cmake/Modules/FindWaffle.cmake \ 39FILES_${PN}-dev += "${datadir}/cmake/Modules/FindWaffle.cmake \
40 ${libdir}/cmake/Waffle/" 40 ${libdir}/cmake/Waffle/"