userland: Fix passing of wayland-native to cmake while configuring
PATCH 1/1 userland: Fix passing of wayland-native to cmake while configuring
From: Tom Doehring <[email protected]>
While having 'wayland' set DISTRO_FEATURES 'wayland-native' is handled as a cmake parameter which breaks the do_configure:
$ cat /data/builds/rpi3-sandbox/tmp/work/raspberrypi2-poky-linux-gnueab i/userland/git-r5/temp/run.do_configure
cmake \
${OECMAKE_SITEFILE} \
[...]
-DCMAKE_BUILD_TYPE=Release -DCMAKE_EXE_LINKER_FLAGS='-Wl,--no-as-needed' wayland-native \
-Wno-dev$ CMake Error: The source directory "/data/builds/rpi3-sandbox/tmp/work/raspberrypi2-poky-linux-gnueabi/userland/git-r5/build/wayland-native" does not exist. | Specify --help for usage, or press the help button on the CMake GUI.
Assuming that wayland-native should only be defined as a DEPENDS package this patch moves it to the correct PACKAGECONFIG position.
Signed-off-by Tom Doehring <[email protected]>
Signed-off-by toolmmy <[email protected]>
--- recipes-graphics/userland/userland_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
recipes-graphics/userland/userland_git.bb +1 -1
@@ -45,7 +45,7 @@ EXTRA_OECMAKE = "-DCMAKE_BUILD_TYPE=Release -DCMAKE_EXE_LINKER_FLAGS='-Wl,--no-a PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)}" -PACKAGECONFIG[wayland] = "-DBUILD_WAYLAND=TRUE -DWAYLAND_SCANNER_EXECUTABLE:FILEPATH=${STAGING_BINDIR_NATIVE}/wayland-scanner,wayland-native,wayland" +PACKAGECONFIG[wayland] = "-DBUILD_WAYLAND=TRUE -DWAYLAND_SCANNER_EXECUTABLE:FILEPATH=${STAGING_BINDIR_NATIVE}/wayland-scanner,,wayland-native wayland" CFLAGS_append = " -fPIC"
Signature · 1 line
1.9.1
Andrei Gherzan
AppliedQuoted 11 lines · toolmmy
From: Tom Doehring <[email protected]>
While having 'wayland' set
DISTRO_FEATURES'wayland-native' is handled as a cmake parameter which breaks thedo_configure:$ cat /data/builds/rpi3-sandbox/tmp/work/raspberrypi2-poky-linux-gnueab i/userland/git-r5/temp/run.do_configure cmake \ ${OECMAKE_SITEFILE} \ [...] -DCMAKE_BUILD_TYPE=Release -DCMAKE_EXE_LINKER_FLAGS='-Wl,--no-as-needed' wayland-native \ -Wno-dev
Quoted 8 lines
$ CMake Error: The source directory "/data/builds/rpi3-sandbox/tmp/work/raspberrypi2-poky-linux-gnueabi/userland/git-r5/build/wayland-native" does not exist. | Specify --help for usage, or press the help button on the CMake GUI.Assuming that wayland-native should only be defined as a DEPENDS package this patch moves it to the correct PACKAGECONFIG position.
Signed-off-by Tom Doehring <[email protected]>Signed-off-by toolmmy <[email protected]>---
Merged to master. Thanks.
--
Andrei Gherzan