summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/xorg-lib
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-graphics/xorg-lib')
-rw-r--r--meta/recipes-graphics/xorg-lib/libxcb.inc5
-rw-r--r--meta/recipes-graphics/xorg-lib/libxcb/disable-check.patch25
2 files changed, 28 insertions, 2 deletions
diff --git a/meta/recipes-graphics/xorg-lib/libxcb.inc b/meta/recipes-graphics/xorg-lib/libxcb.inc
index 75a43a5d3a..453f5500c3 100644
--- a/meta/recipes-graphics/xorg-lib/libxcb.inc
+++ b/meta/recipes-graphics/xorg-lib/libxcb.inc
@@ -10,10 +10,11 @@ BBCLASSEXTEND = "native nativesdk"
10SECTION = "x11/libs" 10SECTION = "x11/libs"
11LICENSE = "MIT-X" 11LICENSE = "MIT-X"
12 12
13DEPENDS = "xcb-proto xproto libxau libxslt-native xcb-proto-native libpthread-stubs" 13DEPENDS = "xcb-proto xproto libxau xcb-proto-native libpthread-stubs"
14 14
15SRC_URI = "http://xcb.freedesktop.org/dist/libxcb-${PV}.tar.bz2 \ 15SRC_URI = "http://xcb.freedesktop.org/dist/libxcb-${PV}.tar.bz2 \
16 file://xcbincludedir.patch" 16 file://xcbincludedir.patch \
17 file://disable-check.patch"
17 18
18PACKAGES_DYNAMIC = "^libxcb-.*" 19PACKAGES_DYNAMIC = "^libxcb-.*"
19 20
diff --git a/meta/recipes-graphics/xorg-lib/libxcb/disable-check.patch b/meta/recipes-graphics/xorg-lib/libxcb/disable-check.patch
new file mode 100644
index 0000000000..5f59a2b9b8
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libxcb/disable-check.patch
@@ -0,0 +1,25 @@
1The "check" package is checked for without an explicit enable/disable option,
2which can lead to non-deterministic build issues with both check and libxslt.
3
4As the unit test suite is minimal at present, simply disable the test suite. In
5the future if the test suite is expanded this can be made conditional on the
6ptest DISTRO_FEATURE.
7
8Upstream-Status: Inappropriate
9Signed-off-by: Ross Burton <ross.burton@intel.com>
10
11
12diff --git a/configure.ac b/configure.ac
13index 6d7c9a5..22cceb9 100644
14--- a/configure.ac
15+++ b/configure.ac
16@@ -21,7 +21,8 @@ AC_USE_SYSTEM_EXTENSIONS
17
18 AM_PATH_PYTHON([2.6])
19
20-PKG_CHECK_MODULES(CHECK, [check >= 0.9.4], [HAVE_CHECK=yes], [HAVE_CHECK=no])
21+dnl PKG_CHECK_MODULES(CHECK, [check >= 0.9.4], [HAVE_CHECK=yes], [HAVE_CHECK=no])
22+HAVE_CHECK=no
23 AM_CONDITIONAL(HAVE_CHECK, test x$HAVE_CHECK = xyes)
24
25 AC_CONFIG_HEADERS([src/config.h]) \ No newline at end of file