diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-03-21 14:26:24 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-03-22 16:54:36 +0000 |
| commit | dfc25eb699346405a2ff83326c22bed2b1574c90 (patch) | |
| tree | a869baa84c06335477c7c6966982760e284f3cb3 | |
| parent | 55de04d1470e6c04ae2859621414697ec5d428e3 (diff) | |
| download | poky-dfc25eb699346405a2ff83326c22bed2b1574c90.tar.gz | |
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 <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-graphics/wayland/mtdev/fixsepbuild.patch | 24 | ||||
| -rw-r--r-- | meta/recipes-graphics/wayland/mtdev_1.1.2.bb | 3 |
2 files changed, 26 insertions, 1 deletions
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 @@ | |||
| 1 | Fix separate build directory builds to avoid the error: | ||
| 2 | |||
| 3 | | make[2]: Entering directory `/media/build1/poky/build/tmp/work/i586-poky-linux/mtdev/1.1.2-r0/build/test' | ||
| 4 | | 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 | ||
| 5 | | /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 | ||
| 6 | | compilation terminated. | ||
| 7 | |||
| 8 | Upstream-Status: Pending | ||
| 9 | |||
| 10 | RP 2013/03/21 | ||
| 11 | |||
| 12 | Index: mtdev/test/Makefile.am | ||
| 13 | =================================================================== | ||
| 14 | --- mtdev/test.orig/Makefile.am 2010-12-22 18:10:41.000000000 +0000 | ||
| 15 | +++ mtdev/test/Makefile.am 2013-03-21 11:47:21.557160981 +0000 | ||
| 16 | @@ -1,7 +1,7 @@ | ||
| 17 | noinst_PROGRAMS = mtdev-mapgen mtdev-matching mtdev-kernel | ||
| 18 | bin_PROGRAMS = mtdev-test | ||
| 19 | |||
| 20 | -INCLUDES=-I$(top_srcdir)/include/ | ||
| 21 | +INCLUDES=-I$(top_srcdir)/include/ -I$(top_srcdir) | ||
| 22 | |||
| 23 | mtdev_mapgen_SOURCES = mtdev-mapgen.c | ||
| 24 | |||
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" | |||
| 13 | LICENSE = "MIT" | 13 | LICENSE = "MIT" |
| 14 | LIC_FILES_CHKSUM = "file://COPYING;md5=ea6bd0268bb0fcd6b27698616ceee5d6" | 14 | LIC_FILES_CHKSUM = "file://COPYING;md5=ea6bd0268bb0fcd6b27698616ceee5d6" |
| 15 | 15 | ||
| 16 | SRC_URI = "http://bitmath.org/code/mtdev/mtdev-1.1.2.tar.bz2" | 16 | SRC_URI = "http://bitmath.org/code/mtdev/mtdev-1.1.2.tar.bz2 \ |
| 17 | file://fixsepbuild.patch" | ||
| 17 | SRC_URI[md5sum] = "d9c7700918fc392e29da7477ae20c5c2" | 18 | SRC_URI[md5sum] = "d9c7700918fc392e29da7477ae20c5c2" |
| 18 | SRC_URI[sha256sum] = "698dd11ca08b3a73ad33d8a5076f6d9e018d97afad3eba36f540b8ea7b775a30" | 19 | SRC_URI[sha256sum] = "698dd11ca08b3a73ad33d8a5076f6d9e018d97afad3eba36f540b8ea7b775a30" |
| 19 | 20 | ||
