Patchwork [3/5] libxcb: disable check to avoid floating dependencies

login
register
mail settings
Submitter Ross Burton
Date May 7, 2014, 4:05 p.m.
Message ID <1399478735-27819-3-git-send-email-ross.burton@intel.com>
Download mbox | patch
Permalink /patch/71705/
State New
Headers show

Comments

Ross Burton - May 7, 2014, 4:05 p.m.
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.

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta/recipes-graphics/xorg-lib/libxcb.inc          |    5 ++--
 .../xorg-lib/libxcb/disable-check.patch            |   25 ++++++++++++++++++++
 2 files changed, 28 insertions(+), 2 deletions(-)
 create mode 100644 meta/recipes-graphics/xorg-lib/libxcb/disable-check.patch

\ No newline at end of file

Patch

diff --git a/meta/recipes-graphics/xorg-lib/libxcb.inc b/meta/recipes-graphics/xorg-lib/libxcb.inc
index 75a43a5..453f550 100644
--- a/meta/recipes-graphics/xorg-lib/libxcb.inc
+++ b/meta/recipes-graphics/xorg-lib/libxcb.inc
@@ -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-.*"
 
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 0000000..5f59a2b
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libxcb/disable-check.patch
@@ -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])