diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-03-21 14:27:18 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-03-22 16:54:37 +0000 |
| commit | 29a1c77d219f8c39f7aeb9afe1e5b303e4772fc3 (patch) | |
| tree | 00dcc5d6f230a8ddfe8409f3083325a672ffc312 | |
| parent | dfc25eb699346405a2ff83326c22bed2b1574c90 (diff) | |
| download | poky-29a1c77d219f8c39f7aeb9afe1e5b303e4772fc3.tar.gz | |
directfb: Fix case where ${B} != ${S}
Add patch to allow out of tree builds to work.
(From OE-Core rev: 15d7fe81bf3c52a14bfdd6a8a854836c8571e14f)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-graphics/directfb/directfb/fixsepbuild.patch | 19 | ||||
| -rw-r--r-- | meta/recipes-graphics/directfb/directfb_1.6.1.bb | 3 |
2 files changed, 21 insertions, 1 deletions
diff --git a/meta/recipes-graphics/directfb/directfb/fixsepbuild.patch b/meta/recipes-graphics/directfb/directfb/fixsepbuild.patch new file mode 100644 index 0000000000..94a9ba5f02 --- /dev/null +++ b/meta/recipes-graphics/directfb/directfb/fixsepbuild.patch | |||
| @@ -0,0 +1,19 @@ | |||
| 1 | Fix out of tree builds | ||
| 2 | |||
| 3 | Upstream-Status: Pending | ||
| 4 | |||
| 5 | RP 2013/03/21 | ||
| 6 | |||
| 7 | Index: DirectFB-1.6.1/configure.in | ||
| 8 | =================================================================== | ||
| 9 | --- DirectFB-1.6.1.orig/configure.in 2013-03-19 01:38:28.174004720 +0000 | ||
| 10 | +++ DirectFB-1.6.1/configure.in 2013-03-21 12:18:10.253113675 +0000 | ||
| 11 | @@ -111,7 +111,7 @@ | ||
| 12 | AC_PATH_TOOL(FLUXCOMP, fluxcomp) | ||
| 13 | AC_SUBST(FLUXCOMP) | ||
| 14 | if test -z "$FLUXCOMP"; then | ||
| 15 | - if ! test -e src/core/CoreDFB.cpp; then | ||
| 16 | + if ! test -e $srcdir/src/core/CoreDFB.cpp; then | ||
| 17 | AC_MSG_ERROR([ | ||
| 18 | *** DirectFB compilation requires fluxcomp *** | ||
| 19 | |||
diff --git a/meta/recipes-graphics/directfb/directfb_1.6.1.bb b/meta/recipes-graphics/directfb/directfb_1.6.1.bb index 6c48a86f81..1230d12944 100644 --- a/meta/recipes-graphics/directfb/directfb_1.6.1.bb +++ b/meta/recipes-graphics/directfb/directfb_1.6.1.bb | |||
| @@ -6,7 +6,8 @@ PR = "${INC_PR}.2" | |||
| 6 | DEPENDS += "sysfsutils" | 6 | DEPENDS += "sysfsutils" |
| 7 | 7 | ||
| 8 | SRC_URI += "file://fix-compilation-with-zlib.patch \ | 8 | SRC_URI += "file://fix-compilation-with-zlib.patch \ |
| 9 | file://rename-no-instrument-function-macro.patch" | 9 | file://rename-no-instrument-function-macro.patch \ |
| 10 | file://fixsepbuild.patch" | ||
| 10 | 11 | ||
| 11 | EXTRA_OECONF = "\ | 12 | EXTRA_OECONF = "\ |
| 12 | --enable-freetype=yes \ | 13 | --enable-freetype=yes \ |
