summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChangqing Li <changqing.li@windriver.com>2019-04-29 15:37:57 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-04-30 12:05:23 +0100
commit71fecb0473dc92fa5402859d77a4634a7561cb55 (patch)
treea7b4534106fcebd734fc6ef4a3ffafece7fc1574
parentc40482a68e964d6c1c24271c12e4d052df2efaf3 (diff)
downloadpoky-71fecb0473dc92fa5402859d77a4634a7561cb55.tar.gz
piglit: support build piglit without x11
* test PIGLIT_BUILD_GL_TESTS depend on glx library, so depend on x11, so respect the DISTRO_FEATURES, only enable it when x11 is enabled. * mesa-demos depend on libGL.so which is provide by recipe mesa, but when x11 is disabled, libGL.so is not generated. so we can only rdepend on this when x11 is enabled * add x11 PACKAGECONFIG to add correct config/depend/rdepend [YOCTO #6077] (From OE-Core rev: 2edf7a19598e10326603603dfa00ab91c9327e2d) Signed-off-by: Changqing Li <changqing.li@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/piglit/piglit_git.bb13
1 files changed, 8 insertions, 5 deletions
diff --git a/meta/recipes-graphics/piglit/piglit_git.bb b/meta/recipes-graphics/piglit/piglit_git.bb
index 59d134801a..b6542a191c 100644
--- a/meta/recipes-graphics/piglit/piglit_git.bb
+++ b/meta/recipes-graphics/piglit/piglit_git.bb
@@ -17,11 +17,12 @@ PV = "1.0+gitr${SRCPV}"
17 17
18S = "${WORKDIR}/git" 18S = "${WORKDIR}/git"
19 19
20DEPENDS = "libpng virtual/libx11 libxkbcommon libxrender waffle virtual/libgl libglu python3-mako-native python3-numpy-native python3-six-native virtual/egl" 20X11_DEPS = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 libxrender libglu', '', d)}"
21X11_RDEPS = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'mesa-demos', '', d)}"
22
23DEPENDS = "libpng waffle libxkbcommon virtual/libgl python3-mako-native python3-numpy-native python3-six-native virtual/egl"
21 24
22inherit cmake pkgconfig python3native distro_features_check bash-completion 25inherit cmake pkgconfig python3native distro_features_check bash-completion
23# depends on virtual/libx11
24REQUIRED_DISTRO_FEATURES = "x11"
25 26
26# depends on virtual/libgl 27# depends on virtual/libgl
27REQUIRED_DISTRO_FEATURES += "opengl" 28REQUIRED_DISTRO_FEATURES += "opengl"
@@ -32,8 +33,10 @@ REQUIRED_DISTRO_FEATURES += "opengl"
32export TEMP = "${B}/temp/" 33export TEMP = "${B}/temp/"
33do_compile[dirs] =+ "${B}/temp/" 34do_compile[dirs] =+ "${B}/temp/"
34 35
35PACKAGECONFIG ??= "" 36PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}"
36PACKAGECONFIG[freeglut] = "-DPIGLIT_USE_GLUT=1,-DPIGLIT_USE_GLUT=0,freeglut," 37PACKAGECONFIG[freeglut] = "-DPIGLIT_USE_GLUT=1,-DPIGLIT_USE_GLUT=0,freeglut,"
38PACKAGECONFIG[x11] = "-DPIGLIT_BUILD_GL_TESTS=ON,-DPIGLIT_BUILD_GL_TESTS=OFF,${X11_DEPS}, ${X11_RDEPS}"
39
37 40
38do_configure_prepend() { 41do_configure_prepend() {
39 if [ "${@bb.utils.contains('PACKAGECONFIG', 'freeglut', 'yes', 'no', d)}" = "no" ]; then 42 if [ "${@bb.utils.contains('PACKAGECONFIG', 'freeglut', 'yes', 'no', d)}" = "no" ]; then
@@ -48,7 +51,7 @@ RDEPENDS_${PN} = "waffle waffle-bin python3 python3-mako python3-json \
48 python3-misc \ 51 python3-misc \
49 python3-unixadmin python3-xml python3-multiprocessing \ 52 python3-unixadmin python3-xml python3-multiprocessing \
50 python3-six python3-shell python3-io \ 53 python3-six python3-shell python3-io \
51 python3-netserver mesa-demos bash \ 54 python3-netserver bash \
52 " 55 "
53 56
54INSANE_SKIP_${PN} += "dev-so already-stripped" 57INSANE_SKIP_${PN} += "dev-so already-stripped"