diff options
author | Andrei Gherzan <andrei@gherzan.ro> | 2013-01-05 18:38:13 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-01-07 13:38:28 +0000 |
commit | ab7f34dc9a931fd2d8a324d01069c4a3ec91a3fa (patch) | |
tree | 2514fbab2abdebc656c8e206e9a9d7ca4efeba84 /meta/recipes-graphics/directfb/directfb_1.6.1.bb | |
parent | ca40915da37b7b9298a5cc336938899df0baa86f (diff) | |
download | poky-ab7f34dc9a931fd2d8a324d01069c4a3ec91a3fa.tar.gz |
directfb: Rename __no_instrument_function__ macro to avoid conflicting redefinitions
The macro was renamed to __dfb_no_instrument_function__ . This will avoid build
errors while compiling gst-plugins-bad with directfb support.
This happens because gstreamer uses this macro to pass it to __attribute__. So,
if we include directfb.h before, the gstreamer definition will end up:
__attribute__ ((__attribute__((no_instrument_function)))).
(From OE-Core rev: 3e87b2b796e2de50adcdf5ed9d777765ae8e3cee)
Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/directfb/directfb_1.6.1.bb')
-rw-r--r-- | meta/recipes-graphics/directfb/directfb_1.6.1.bb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/meta/recipes-graphics/directfb/directfb_1.6.1.bb b/meta/recipes-graphics/directfb/directfb_1.6.1.bb index a6012ca290..52f78c6455 100644 --- a/meta/recipes-graphics/directfb/directfb_1.6.1.bb +++ b/meta/recipes-graphics/directfb/directfb_1.6.1.bb | |||
@@ -1,11 +1,12 @@ | |||
1 | require directfb.inc | 1 | require directfb.inc |
2 | 2 | ||
3 | RV = "1.6-0" | 3 | RV = "1.6-0" |
4 | PR = "${INC_PR}.1" | 4 | PR = "${INC_PR}.2" |
5 | 5 | ||
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 | 10 | ||
10 | EXTRA_OECONF = "\ | 11 | EXTRA_OECONF = "\ |
11 | --enable-freetype=yes \ | 12 | --enable-freetype=yes \ |