summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/drm/libdrm
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2016-02-11 23:39:54 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-02-14 11:42:19 +0000
commitbe5b72cf27e580adfb24b1236d4b7719aa0da498 (patch)
treeb63146d6102200815220b22b3feee955def68536 /meta/recipes-graphics/drm/libdrm
parent5fc5996c23643ef2e0e316f60d587ced545a769f (diff)
downloadpoky-be5b72cf27e580adfb24b1236d4b7719aa0da498.tar.gz
libdrm: don't detect components that have been disabled
We pass --disable-cairo-tests but if cairo is in the sysroot it is detected and used, which causes problems in mass builds as cairo could be removed whilst libdrm is being built. (From OE-Core rev: 71882b061bad55f4ad62c7d235a4a629dd74dda8) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/drm/libdrm')
-rw-r--r--meta/recipes-graphics/drm/libdrm/detect.patch59
1 files changed, 59 insertions, 0 deletions
diff --git a/meta/recipes-graphics/drm/libdrm/detect.patch b/meta/recipes-graphics/drm/libdrm/detect.patch
new file mode 100644
index 0000000000..6397a5954e
--- /dev/null
+++ b/meta/recipes-graphics/drm/libdrm/detect.patch
@@ -0,0 +1,59 @@
1Upstream-Status: Backport
2Signed-off-by: Ross Burton <ross.burton@intel.com>
3
4commit 798022b61c58d945f9027c823a188dcedecd3d06
5Author: Marcin Ślusarz <marcin.slusarz@gmail.com>
6Date: Sun Jan 24 13:17:34 2016 +0100
7
8 configure.ac: don't detect disabled options dependencies
9
10 Currently with --disable-amdgpu --disable-valgrind --disable-cairo-tests
11 cunit, valgrind and cairo are still detected.
12
13 Signed-off-by: Marcin Ślusarz <marcin.slusarz@gmail.com>
14 Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
15
16diff --git a/configure.ac b/configure.ac
17index 057a846..a09be61 100644
18--- a/configure.ac
19+++ b/configure.ac
20@@ -363,12 +363,14 @@ fi
21-# Detect cunit library
22-PKG_CHECK_MODULES([CUNIT], [cunit >= 2.1], [have_cunit=yes], [have_cunit=no])
23-# If pkg-config does not find cunit, check it using AC_CHECK_LIB. We
24-# do this because Debian (Ubuntu) lacks pkg-config file for cunit.
25-# fixed in 2.1-2.dfsg-3: http://anonscm.debian.org/cgit/collab-maint/cunit.git/commit/?h=debian
26-if test "x${have_cunit}" = "xno"; then
27- AC_CHECK_LIB([cunit], [CU_initialize_registry], [have_cunit=yes], [have_cunit=no])
28- if test "x${have_cunit}" = "xyes"; then
29- CUNIT_LIBS="-lcunit"
30- CUNIT_CFLAGS=""
31- AC_SUBST([CUNIT_LIBS])
32- AC_SUBST([CUNIT_CFLAGS])
33+if test "x$AMDGPU" != xno; then
34+ # Detect cunit library
35+ PKG_CHECK_MODULES([CUNIT], [cunit >= 2.1], [have_cunit=yes], [have_cunit=no])
36+ # If pkg-config does not find cunit, check it using AC_CHECK_LIB. We
37+ # do this because Debian (Ubuntu) lacks pkg-config file for cunit.
38+ # fixed in 2.1-2.dfsg-3: http://anonscm.debian.org/cgit/collab-maint/cunit.git/commit/?h=debian
39+ if test "x${have_cunit}" = "xno"; then
40+ AC_CHECK_LIB([cunit], [CU_initialize_registry], [have_cunit=yes], [have_cunit=no])
41+ if test "x${have_cunit}" = "xyes"; then
42+ CUNIT_LIBS="-lcunit"
43+ CUNIT_CFLAGS=""
44+ AC_SUBST([CUNIT_LIBS])
45+ AC_SUBST([CUNIT_CFLAGS])
46+ fi
47@@ -375,0 +378,2 @@ if test "x${have_cunit}" = "xno"; then
48+else
49+ have_cunit=no
50@@ -404 +408,3 @@ AC_ARG_ENABLE([cairo-tests],
51-PKG_CHECK_MODULES(CAIRO, cairo, [HAVE_CAIRO=yes], [HAVE_CAIRO=no])
52+if test "x$CAIRO" != xno; then
53+ PKG_CHECK_MODULES(CAIRO, cairo, [HAVE_CAIRO=yes], [HAVE_CAIRO=no])
54+fi
55@@ -449 +455,3 @@ AC_ARG_ENABLE(valgrind,
56-PKG_CHECK_MODULES(VALGRIND, [valgrind], [have_valgrind=yes], [have_valgrind=no])
57+if test "x$VALGRIND" != xno; then
58+ PKG_CHECK_MODULES(VALGRIND, [valgrind], [have_valgrind=yes], [have_valgrind=no])
59+fi