From dfc25eb699346405a2ff83326c22bed2b1574c90 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 21 Mar 2013 14:26:24 +0000 Subject: mtdev: Fix case where ${B} != ${S} Add patch to allow out of tree builds to work. (From OE-Core rev: d14012cbf4a55a66030a51da281cc68fc727d9f6) Signed-off-by: Richard Purdie --- .../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 (limited to 'meta/recipes-graphics') diff --git a/meta/recipes-graphics/wayland/mtdev/fixsepbuild.patch b/meta/recipes-graphics/wayland/mtdev/fixsepbuild.patch new file mode 100644 index 0000000000..00a5c27560 --- /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 95d99ee20e..6918f3ebd5 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" -- cgit v1.2.3-54-g00ecf