From 597615a8cc4909059b787e753e81de5d746bb4eb Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Mon, 1 Dec 2014 21:42:32 +0100 Subject: efl, elementary, emotion-generic-players, evas-generic-loaders: upgrade to 1.12.* * announcements: https://phab.enlightenment.org/phame/post/view/96/ https://phab.enlightenment.org/phame/post/view/99/ Signed-off-by: Martin Jansa --- meta-efl/recipes-efl/efl/elementary.inc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'meta-efl/recipes-efl/efl/elementary.inc') diff --git a/meta-efl/recipes-efl/efl/elementary.inc b/meta-efl/recipes-efl/efl/elementary.inc index c5e75b96c..f0a92dfe9 100644 --- a/meta-efl/recipes-efl/efl/elementary.inc +++ b/meta-efl/recipes-efl/efl/elementary.inc @@ -12,6 +12,7 @@ EXTRA_OECONF_append_class-target = "\ --with-elementary-codegen=${STAGING_BINDIR_NATIVE}/elementary_codegen \ --with-elm-prefs-cc=${STAGING_BINDIR_NATIVE}/elm_prefs_cc \ --with-eolian-gen=${STAGING_BINDIR_NATIVE}/eolian_gen \ + --with-eolian-cxx=${STAGING_BINDIR_NATIVE}/eolian_cxx \ " BBCLASSEXTEND = "native" @@ -23,8 +24,8 @@ PACKAGECONFIG[ewebkit] = "--with-elementary-web-backend=ewebkit,--with-elementar PACKAGECONFIG[c++11] = "--enable-cxx-bindings,--disable-cxx-bindings" do_configure_prepend() { - # prefix returned eolian paths with STAGING_DIR_HOST also use $PKG_CONFIG instead of pkg-config directly - sed -i "s^DEPS_EOLIAN_FLAGS=\`pkg-config --variable=eolian_flags eo evas edje ecore\`$^DEPS_EOLIAN_FLAGS=\`\$PKG_CONFIG --variable=eolian_flags eo evas edje ecore | sed 's#-I${prefix}#-I${STAGING_DIR_HOST}${prefix}#g'\`^g" ${S}/configure.ac + # prefix returned eolian paths with STAGING_DIR_HOST + sed -i 's%^\(DEPS_EOLIAN_FLAGS=`.*\)`$%\1 | sed "s#-I\\${prefix}#-I\\${STAGING_DIR_HOST}\\${prefix}#g"`%g' ${S}/configure.ac } do_compile_append_class-target() { -- cgit v1.2.3-54-g00ecf