Patchwork [12/16] mtdev: Fix case where ${B} != ${S}

login
register
mail settings
Submitter Richard Purdie
Date March 21, 2013, 3:55 p.m.
Message ID <1363881315-24352-12-git-send-email-richard.purdie@linuxfoundation.org>
Download mbox | patch
Permalink /patch/46639/
State Accepted
Commit d14012cbf4a55a66030a51da281cc68fc727d9f6
Headers show

Comments

Richard Purdie - March 21, 2013, 3:55 p.m.
Add patch to allow out of tree builds to work.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 .../wayland/mtdev/fixsepbuild.patch                |   24 ++++++++++++++++++++
 meta/recipes-graphics/wayland/mtdev_1.1.2.bb       |    3 ++-
 2 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-graphics/wayland/mtdev/fixsepbuild.patch

Patch

diff --git a/meta/recipes-graphics/wayland/mtdev/fixsepbuild.patch b/meta/recipes-graphics/wayland/mtdev/fixsepbuild.patch
new file mode 100644
index 0000000..00a5c27
--- /dev/null
+++ b/meta/recipes-graphics/wayland/mtdev/fixsepbuild.patch
@@ -0,0 +1,24 @@ 
+Fix separate build directory builds to avoid the error:
+
+| 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: 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
+@@ -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)
+ 
+ mtdev_mapgen_SOURCES = mtdev-mapgen.c
+ 
diff --git a/meta/recipes-graphics/wayland/mtdev_1.1.2.bb b/meta/recipes-graphics/wayland/mtdev_1.1.2.bb
index 95d99ee..6918f3e 100644
--- a/meta/recipes-graphics/wayland/mtdev_1.1.2.bb
+++ b/meta/recipes-graphics/wayland/mtdev_1.1.2.bb
@@ -13,7 +13,8 @@  SECTION = "libs"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://COPYING;md5=ea6bd0268bb0fcd6b27698616ceee5d6"
 
-SRC_URI = "http://bitmath.org/code/mtdev/mtdev-1.1.2.tar.bz2"
+SRC_URI = "http://bitmath.org/code/mtdev/mtdev-1.1.2.tar.bz2 \
+           file://fixsepbuild.patch"
 SRC_URI[md5sum] = "d9c7700918fc392e29da7477ae20c5c2"
 SRC_URI[sha256sum] = "698dd11ca08b3a73ad33d8a5076f6d9e018d97afad3eba36f540b8ea7b775a30"