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

login
register
mail settings
Submitter Ross Burton
Date July 17, 2014, 4:41 p.m.
Message ID <1405615278-28413-1-git-send-email-ross.burton@intel.com>
Download mbox | patch
Permalink /patch/75951/
State Accepted
Commit 551e456c714662e84eb50dd6d8143b95524ab6d6
Headers show

Comments

Ross Burton - July 17, 2014, 4:41 p.m.
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.

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 .../xf86-video-intel/disable-x11-dri3.patch           |   17 +++++++++++++++++
 .../xorg-driver/xf86-video-intel_2.99.912.bb          |    3 ++-
 2 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-graphics/xorg-driver/xf86-video-intel/disable-x11-dri3.patch

Patch

diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-intel/disable-x11-dri3.patch b/meta/recipes-graphics/xorg-driver/xf86-video-intel/disable-x11-dri3.patch
new file mode 100644
index 0000000..dda508d
--- /dev/null
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-intel/disable-x11-dri3.patch
@@ -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"])
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.99.912.bb b/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.99.912.bb
index 0777690..544de4a 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.99.912.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.99.912.bb
@@ -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"