xf86-video-intel: disable non-deterministic tests for libX11

libX11 et al are checked for at confgure time and tests optionally built.  As
these don't get installed we don't want to add build dependencies, but the
non-determinism means that builds can fail.

(From OE-Core rev: cc4de34c94a89831c2aac56b9fb78612cdde0099)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ross Burton 2014-07-17 17:41:18 +01:00 committed by Richard Purdie
parent ee2b26fe75
commit 551e456c71
2 changed files with 19 additions and 1 deletions

View File

@ -0,0 +1,17 @@
These modules are only used for tests that don't get installed, and the
automatic detection without explicit dependencies means that a build can find
e.g. xshmfence at configure time but then it's been removed from the sysroot by
the time compile happens.
As the tests don't get installed, just disable the checks.
Upstream-Status: Inappropriate [OE-specific]
Signed-off-by: Ross Burton <ross.burton@intel.com>
diff --git a/configure.ac b/configure.ac
index bd654f3..78a0e0d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -251 +251 @@ fi
-PKG_CHECK_MODULES(X11_DRI3, [xcb-dri3 xcb-sync xcb-present x11-xcb xshmfence x11 xrender xext libdrm], [x11_dri3="yes"], [x11_dri3="no"])
+#PKG_CHECK_MODULES(X11_DRI3, [xcb-dri3 xcb-sync xcb-present x11-xcb xshmfence x11 xrender xext libdrm], [x11_dri3="yes"], [x11_dri3="no"])

View File

@ -9,7 +9,8 @@ Infrastructure (DRI)."
LIC_FILES_CHKSUM = "file://COPYING;md5=8730ad58d11c7bbad9a7066d69f7808e"
SRC_URI += "file://configure-dri.patch"
SRC_URI += "file://configure-dri.patch \
file://disable-x11-dri3.patch"
SRC_URI[md5sum] = "88d1a884f9b7bd07bf0755cfa34052d4"
SRC_URI[sha256sum] = "7c8ffc492d59f34cac64093deb70717b4d9223cf416ecc6fa016ab2e8bde9501"