Patchwork [meta-efl,05/11] efl.bbclass: don't remove STAGING_LIBDIR STAGING_INCDIR from efl pkgconfig files

login
register
mail settings
Submitter Martin Jansa
Date Nov. 30, 2011, 8:16 a.m.
Message ID <3cd56302dbe7ffe56a8762c2de86afe2374ac192.1322640506.git.Martin.Jansa@gmail.com>
Download mbox | patch
Permalink /patch/15793/
State Accepted
Commit dcf924eb24aee888323727a64c33e57317f4d9c7
Headers show

Comments

Martin Jansa - Nov. 30, 2011, 8:16 a.m.
* 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 <Martin.Jansa@gmail.com>
---
 meta-efl/classes/efl.bbclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Patch

diff --git a/meta-efl/classes/efl.bbclass b/meta-efl/classes/efl.bbclass
index f90dc1c..792343b 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
 }