]> code.ossystems Code Review - openembedded-core.git/commitdiff
directfb: Correct bashism
authorRichard Purdie <richard.purdie@linuxfoundation.org>
Sun, 3 May 2015 10:28:22 +0000 (11:28 +0100)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Tue, 5 May 2015 21:14:08 +0000 (22:14 +0100)
Fix builds of directfb on systems with dash as /bin/sh

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/recipes-graphics/directfb/directfb.inc
meta/recipes-graphics/directfb/directfb/bashism.patch [new file with mode: 0644]

index e863b12094cf85cab3a435da4b86fee7335dd1ca..4fbca878ef0c58b469ea4eee169ba06157bf9d69 100644 (file)
@@ -13,7 +13,8 @@ DEPENDS = "jpeg libpng freetype zlib tslib sysfsutils"
 
 SRC_URI = "http://www.directfb.org/downloads/Core/DirectFB-1.7/DirectFB-${PV}.tar.gz \
            file://configurefix.patch \
-           file://fusion.patch"
+           file://fusion.patch \
+           file://bashism.patch"
 
 S = "${WORKDIR}/DirectFB-${PV}"
 
diff --git a/meta/recipes-graphics/directfb/directfb/bashism.patch b/meta/recipes-graphics/directfb/directfb/bashism.patch
new file mode 100644 (file)
index 0000000..2ef4e93
--- /dev/null
@@ -0,0 +1,18 @@
+${x//y/} is a bash syntax. Replace with something dash compatible
+
+RP 2015/5/3
+Upstream-Status: Pending
+
+Index: DirectFB-1.7.7/configure.in
+===================================================================
+--- DirectFB-1.7.7.orig/configure.in
++++ DirectFB-1.7.7/configure.in
+@@ -2696,7 +2696,7 @@ AM_CONDITIONAL(BUILD_TOOLS, test "$with_
+ AM_CONDITIONAL(CROSS_COMPILING, test "$cross_compiling" = "yes")
+ CFLAGS="$CFLAGS $DFB_INTERNAL_CFLAGS"
+-CXXFLAGS="$CXXFLAGS ${CFLAGS//-Werror-implicit-function-declaration/}"
++CXXFLAGS="$CXXFLAGS $(printf '%s\n' "$CFLAGS" | sed 's/-Werror-implicit-function-declaration//g')"
+ DFB_LDFLAGS="$LDFLAGS $ZLIB_LIBS"
+ CFLAGS="$CFLAGS $CFLAGS_STD"