summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2014-05-07 17:05:33 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-05-11 12:27:21 +0100
commita1bad2435227ce16fe63ed14087f72c24767e6e1 (patch)
tree91f04c6eaf88cb2578ad291dae76954105f50cb5 /meta/recipes-graphics
parent6fcd765178f050f370c9c9c8ae2bfbcd5c880986 (diff)
downloadpoky-a1bad2435227ce16fe63ed14087f72c24767e6e1.tar.gz
libxcb: disable check to avoid floating dependencies
The "check" module is checked for in configure without any way to explicitly enable or disable it, but it isn't a build dependency of libxcb. If it's found libxslt is also checked for, which is a build dependency but will only be used if check is also present. As the libxcb unit test suite is minimal at present, forcibly disable the test for check and remove the libxslt-native build dependency. (From OE-Core rev: 510e64d90d3ef2f9757bfa148e8cc09e4834051d) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics')
-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