From dcf924eb24aee888323727a64c33e57317f4d9c7 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 30 Nov 2011 08:16:52 +0000 Subject: efl.bbclass: don't remove STAGING_LIBDIR STAGING_INCDIR from efl pkgconfig files * but replace those with ${libdir} and ${includedir} * it was breaking edbus: Cflags: -I${includedir}/e_dbus-1 -I/OE/shr-core/tmp-eglibc/sysroots/qemuarm/usr/include/dbus-1.0 -I/OE/shr-core/tmp-eglibc/sysroots/qemuarm/usr/lib/dbus-1.0/include after make install: Cflags: -I${includedir}/e_dbus-1 /dbus-1.0 -I/OE/shr-core/tmp-eglibc/sysroots/qemuarm/usr/lib/dbus-1.0/include * and notice that dbus-1 is using -I{libdir} here, so replace it too Signed-off-by: Martin Jansa Signed-off-by: Koen Kooi --- meta-efl/classes/efl.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-efl/classes/efl.bbclass') diff --git a/meta-efl/classes/efl.bbclass b/meta-efl/classes/efl.bbclass index f90dc1ca42..792343b695 100644 --- a/meta-efl/classes/efl.bbclass +++ b/meta-efl/classes/efl.bbclass @@ -15,7 +15,7 @@ do_configure_prepend() { do_install_prepend () { for i in `find ${S}/ -name "*.pc" -type f` ; do \ - sed -i -e 's:-L${STAGING_LIBDIR}::g' -e 's:-I${STAGING_INCDIR}::g' $i + sed -i -e 's:-L${STAGING_LIBDIR}:-L\$\{libdir\}:g' -e 's:-I${STAGING_LIBDIR}:-I\$\{libdir\}:g' -e 's:-I${STAGING_INCDIR}:-I\$\{includedir\}:g' $i done } -- cgit v1.2.3-54-g00ecf