aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/wayland/mtdev/fixsepbuild.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-graphics/wayland/mtdev/fixsepbuild.patch')
-rw-r--r--meta/recipes-graphics/wayland/mtdev/fixsepbuild.patch30
1 files changed, 15 insertions, 15 deletions
diff --git a/meta/recipes-graphics/wayland/mtdev/fixsepbuild.patch b/meta/recipes-graphics/wayland/mtdev/fixsepbuild.patch
index 00a5c27560..9895650274 100644
--- a/meta/recipes-graphics/wayland/mtdev/fixsepbuild.patch
+++ b/meta/recipes-graphics/wayland/mtdev/fixsepbuild.patch
@@ -1,24 +1,24 @@
-Fix separate build directory builds to avoid the error:
+Some tests do #include relative to the top-level, so add top_srcdir to the
+include path as otherwise out-of-tree builds can't find the files.
-| make[2]: Entering directory `/media/build1/poky/build/tmp/work/i586-poky-linux/mtdev/1.1.2-r0/build/test'
-| i586-poky-linux-gcc -m32 -march=i586 --sysroot=/media/build1/poky/build/tmp/sysroots/qemux86 -DHAVE_CONFIG_H -I. -I/media/build1/poky/build/tmp/work/i586-poky-linux/mtdev/1.1.2-r0/mtdev-1.1.2/test -I.. -I/media/build1/poky/build/tmp/work/i586-poky-linux/mtdev/1.1.2-r0/mtdev-1.1.2/include/ -O2 -pipe -g -feliminate-unused-debug-types -c /media/build1/poky/build/tmp/work/i586-poky-linux/mtdev/1.1.2-r0/mtdev-1.1.2/test/mtdev-matching.c
-| /media/build1/poky/build/tmp/work/i586-poky-linux/mtdev/1.1.2-r0/mtdev-1.1.2/test/mtdev-matching.c:29:23: fatal error: src/match.h: No such file or directory
-| compilation terminated.
+Upstream-Status: Submitted
+Signed-off-by: Ross Burton <ross.burton@intel.com>
+---
+ test/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
-Upstream-Status: Pending
-
-RP 2013/03/21
-
-Index: mtdev/test/Makefile.am
-===================================================================
---- mtdev/test.orig/Makefile.am 2010-12-22 18:10:41.000000000 +0000
-+++ mtdev/test/Makefile.am 2013-03-21 11:47:21.557160981 +0000
+diff --git a/test/Makefile.am b/test/Makefile.am
+index 2b504bd..6688b41 100644
+--- a/test/Makefile.am
++++ b/test/Makefile.am
@@ -1,7 +1,7 @@
noinst_PROGRAMS = mtdev-mapgen mtdev-matching mtdev-kernel
bin_PROGRAMS = mtdev-test
--INCLUDES=-I$(top_srcdir)/include/
-+INCLUDES=-I$(top_srcdir)/include/ -I$(top_srcdir)
+-AM_CPPFLAGS=-I$(top_srcdir)/include/
++AM_CPPFLAGS=-I$(top_srcdir) -I$(top_srcdir)/include/
mtdev_mapgen_SOURCES = mtdev-mapgen.c
+--
+1.7.10.4