summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2015-05-03 11:28:22 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-05-05 22:15:17 +0100
commitf841526801de853c651219f755bcf684e2a3e024 (patch)
treecb1401521059b1e3fdacdc460326923856dac29c
parent7a8f37daa7b42905233c31366915b897886a957a (diff)
downloadpoky-f841526801de853c651219f755bcf684e2a3e024.tar.gz
directfb: Correct bashism
Fix builds of directfb on systems with dash as /bin/sh (From OE-Core rev: 8848517fb4c81b9e9cfc985dd20b9baf374764c0) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/directfb/directfb.inc3
-rw-r--r--meta/recipes-graphics/directfb/directfb/bashism.patch18
2 files changed, 20 insertions, 1 deletions
diff --git a/meta/recipes-graphics/directfb/directfb.inc b/meta/recipes-graphics/directfb/directfb.inc
index e863b12094..4fbca878ef 100644
--- a/meta/recipes-graphics/directfb/directfb.inc
+++ b/meta/recipes-graphics/directfb/directfb.inc
@@ -13,7 +13,8 @@ DEPENDS = "jpeg libpng freetype zlib tslib sysfsutils"
13 13
14SRC_URI = "http://www.directfb.org/downloads/Core/DirectFB-1.7/DirectFB-${PV}.tar.gz \ 14SRC_URI = "http://www.directfb.org/downloads/Core/DirectFB-1.7/DirectFB-${PV}.tar.gz \
15 file://configurefix.patch \ 15 file://configurefix.patch \
16 file://fusion.patch" 16 file://fusion.patch \
17 file://bashism.patch"
17 18
18S = "${WORKDIR}/DirectFB-${PV}" 19S = "${WORKDIR}/DirectFB-${PV}"
19 20
diff --git a/meta/recipes-graphics/directfb/directfb/bashism.patch b/meta/recipes-graphics/directfb/directfb/bashism.patch
new file mode 100644
index 0000000000..2ef4e93853
--- /dev/null
+++ b/meta/recipes-graphics/directfb/directfb/bashism.patch
@@ -0,0 +1,18 @@
1${x//y/} is a bash syntax. Replace with something dash compatible
2
3RP 2015/5/3
4Upstream-Status: Pending
5
6Index: DirectFB-1.7.7/configure.in
7===================================================================
8--- DirectFB-1.7.7.orig/configure.in
9+++ DirectFB-1.7.7/configure.in
10@@ -2696,7 +2696,7 @@ AM_CONDITIONAL(BUILD_TOOLS, test "$with_
11 AM_CONDITIONAL(CROSS_COMPILING, test "$cross_compiling" = "yes")
12
13 CFLAGS="$CFLAGS $DFB_INTERNAL_CFLAGS"
14-CXXFLAGS="$CXXFLAGS ${CFLAGS//-Werror-implicit-function-declaration/}"
15+CXXFLAGS="$CXXFLAGS $(printf '%s\n' "$CFLAGS" | sed 's/-Werror-implicit-function-declaration//g')"
16 DFB_LDFLAGS="$LDFLAGS $ZLIB_LIBS"
17
18 CFLAGS="$CFLAGS $CFLAGS_STD"