summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJussi Kukkonen <jussi.kukkonen@intel.com>2016-09-13 11:46:41 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-09-14 22:22:13 +0100
commit0825fcf7001aabc2084cc10e8d9aebbf327c884b (patch)
tree771e3e71d2e9cdaa930fabe5ba3ed4176ef9a84f
parent2e8c59d059b21dce23c848e837bd98de5e21dafd (diff)
downloadpoky-0825fcf7001aabc2084cc10e8d9aebbf327c884b.tar.gz
libdrm: Explicitly disable cunit tests
Add patch to control building cunit-tests explicitly. Disable them in the recipe. Fixes [YOCTO #9849]. (From OE-Core rev: cd287235fc5b9d0c174a10a89e31ffd391806113) Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/drm/libdrm/0001-configure.ac-Allow-explicit-enabling-of-cunit-tests.patch56
-rw-r--r--meta/recipes-graphics/drm/libdrm_2.4.70.bb2
2 files changed, 58 insertions, 0 deletions
diff --git a/meta/recipes-graphics/drm/libdrm/0001-configure.ac-Allow-explicit-enabling-of-cunit-tests.patch b/meta/recipes-graphics/drm/libdrm/0001-configure.ac-Allow-explicit-enabling-of-cunit-tests.patch
new file mode 100644
index 0000000000..bf526370b0
--- /dev/null
+++ b/meta/recipes-graphics/drm/libdrm/0001-configure.ac-Allow-explicit-enabling-of-cunit-tests.patch
@@ -0,0 +1,56 @@
1From e6bd4205b0b546afe991ae6f72256645f4404ad4 Mon Sep 17 00:00:00 2001
2From: Jussi Kukkonen <jussi.kukkonen@intel.com>
3Date: Mon, 5 Sep 2016 14:41:37 +0300
4Subject: [PATCH libdrm] configure.ac: Allow explicit enabling of cunit tests
5
6Add --with-cunit to make it easier to do reproducible builds. Default
7is still to probe cunit and build opportunistically.
8
9Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
10Upstream-Status: Submitted [mailing list]
11---
12 configure.ac | 14 ++++++++++++--
13 1 file changed, 12 insertions(+), 2 deletions(-)
14
15diff --git a/configure.ac b/configure.ac
16index e3048c7..918d21d 100644
17--- a/configure.ac
18+++ b/configure.ac
19@@ -137,6 +137,12 @@ AC_ARG_ENABLE(install-test-programs,
20 [Install test programs (default: no)]),
21 [INSTALL_TESTS=$enableval], [INSTALL_TESTS=no])
22
23+AC_ARG_WITH([cunit],
24+ [AS_HELP_STRING([--with-cunit],
25+ [Build tests that use cunit (default: auto)])],
26+ [],
27+ [with_cunit=auto])
28+
29 dnl ===========================================================================
30 dnl check compiler flags
31 AC_DEFUN([LIBDRM_CC_TRY_FLAG], [
32@@ -372,7 +378,7 @@ if test "x$RADEON" = xyes; then
33 AC_DEFINE(HAVE_RADEON, 1, [Have radeon support])
34 fi
35
36-if test "x$AMDGPU" != xno; then
37+if test "x$with_cunit" != xno -a "x$AMDGPU" != xno; then
38 # Detect cunit library
39 PKG_CHECK_MODULES([CUNIT], [cunit >= 2.1], [have_cunit=yes], [have_cunit=no])
40 # If pkg-config does not find cunit, check it using AC_CHECK_LIB. We
41@@ -399,7 +406,11 @@ if test "x$AMDGPU" = xyes; then
42 AC_DEFINE(HAVE_CUNIT, [test "x$have_cunit" != "xno"], [Enable CUNIT Have amdgpu support])
43
44 if test "x$have_cunit" = "xno"; then
45- AC_MSG_WARN([Could not find cunit library. Disabling amdgpu tests])
46+ if test "x$with_cunit" = "xyes"; then
47+ AC_MSG_ERROR([Could not find cunit library but --with-cunit was given])
48+ elif test "x$with_cunit" = "xauto"; then
49+ AC_MSG_WARN([Could not find cunit library. Disabling amdgpu tests])
50+ fi
51 fi
52 fi
53
54--
552.1.4
56
diff --git a/meta/recipes-graphics/drm/libdrm_2.4.70.bb b/meta/recipes-graphics/drm/libdrm_2.4.70.bb
index 632c30e9bf..a2b5282eaf 100644
--- a/meta/recipes-graphics/drm/libdrm_2.4.70.bb
+++ b/meta/recipes-graphics/drm/libdrm_2.4.70.bb
@@ -13,6 +13,7 @@ DEPENDS = "libpthread-stubs udev libpciaccess"
13SRC_URI = "http://dri.freedesktop.org/libdrm/${BP}.tar.bz2 \ 13SRC_URI = "http://dri.freedesktop.org/libdrm/${BP}.tar.bz2 \
14 file://installtests.patch \ 14 file://installtests.patch \
15 file://fix_O_CLOEXEC_undeclared.patch \ 15 file://fix_O_CLOEXEC_undeclared.patch \
16 file://0001-configure.ac-Allow-explicit-enabling-of-cunit-tests.patch \
16 " 17 "
17 18
18SRC_URI[md5sum] = "920957cfe25a80efb02be9bd90bf3c1e" 19SRC_URI[md5sum] = "920957cfe25a80efb02be9bd90bf3c1e"
@@ -21,6 +22,7 @@ SRC_URI[sha256sum] = "b17d4b39ed97ca0e4cffa0db06ff609e617bac94646ec38e8e0579d530
21inherit autotools pkgconfig 22inherit autotools pkgconfig
22 23
23EXTRA_OECONF += "--disable-cairo-tests \ 24EXTRA_OECONF += "--disable-cairo-tests \
25 --without-cunit \
24 --enable-omap-experimental-api \ 26 --enable-omap-experimental-api \
25 --enable-install-test-programs \ 27 --enable-install-test-programs \
26 --disable-manpages \ 28 --disable-manpages \