mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-08 17:19:20 +00:00
Code Issues Projects Releases Wiki Activity

libxcb: disable check to avoid floating dependencies

Browse Source 
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>
This commit is contained in:
Ross Burton
2014-05-07 17:05:33 +01:00
committed by Richard Purdie
parent 6fcd765178
commit a1bad24352
2 changed files with 28 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-graphics/xorg-lib/libxcb.inc
+3 -2
View File
@@ -10,10 +10,11 @@ BBCLASSEXTEND = "native nativesdk"
SECTION = "x11/libs"
LICENSE = "MIT-X"
DEPENDS = "xcb-proto xproto libxau libxslt-native xcb-proto-native libpthread-stubs"
DEPENDS = "xcb-proto xproto libxau xcb-proto-native libpthread-stubs"
SRC_URI = "http://xcb.freedesktop.org/dist/libxcb-${PV}.tar.bz2 \
file://xcbincludedir.patch"
file://xcbincludedir.patch \
file://disable-check.patch"
PACKAGES_DYNAMIC = "^libxcb-.*"
meta/recipes-graphics/xorg-lib/libxcb/disable-check.patch
+25
View File
@@ -0,0 +1,25 @@
The "check" package is checked for without an explicit enable/disable option,
which can lead to non-deterministic build issues with both check and libxslt.
As the unit test suite is minimal at present, simply disable the test suite. In
the future if the test suite is expanded this can be made conditional on the
ptest DISTRO_FEATURE.
Upstream-Status: Inappropriate
Signed-off-by: Ross Burton <ross.burton@intel.com>
diff --git a/configure.ac b/configure.ac
index 6d7c9a5..22cceb9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,7 +21,8 @@ AC_USE_SYSTEM_EXTENSIONS
AM_PATH_PYTHON([2.6])
-PKG_CHECK_MODULES(CHECK, [check >= 0.9.4], [HAVE_CHECK=yes], [HAVE_CHECK=no])
+dnl PKG_CHECK_MODULES(CHECK, [check >= 0.9.4], [HAVE_CHECK=yes], [HAVE_CHECK=no])
+HAVE_CHECK=no
AM_CONDITIONAL(HAVE_CHECK, test x$HAVE_CHECK = xyes)
AC_CONFIG_HEADERS([src/config.h])