From: Richard Purdie Date: Sun, 3 May 2015 10:28:22 +0000 (+0100) Subject: directfb: Correct bashism X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f841526801de853c651219f755bcf684e2a3e024;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git directfb: Correct bashism Fix builds of directfb on systems with dash as /bin/sh (From OE-Core rev: 8848517fb4c81b9e9cfc985dd20b9baf374764c0) Signed-off-by: Richard Purdie --- diff --git a/meta/recipes-graphics/directfb/directfb.inc b/meta/recipes-graphics/directfb/directfb.inc index e863b12094c..4fbca878ef0 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" 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 index 00000000000..2ef4e938533 --- /dev/null +++ b/meta/recipes-graphics/directfb/directfb/bashism.patch @@ -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"