git.openpandora.org
/
openembedded.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'org.openembedded.dev' of new.openembedded.org:openembedded into org...
[openembedded.git]
/
classes
/
efl.bbclass
diff --git
a/classes/efl.bbclass
b/classes/efl.bbclass
index
d4c3baa
..
1433457
100644
(file)
--- a/
classes/efl.bbclass
+++ b/
classes/efl.bbclass
@@
-11,16
+11,19
@@
PE = "2"
ARM_INSTRUCTION_SET = "arm"
ARM_INSTRUCTION_SET = "arm"
-AUTOTOOLS_STAGE_PKGCONFIG = "1"
-# do NOT inherit pkgconfig here, see note in autotools_stage_all
inherit autotools
inherit autotools
+# evas-native looks at this var, so keep it
+AUTOTOOLS_STAGE_PKGCONFIG = "1"
+
do_configure_prepend() {
do_configure_prepend() {
- touch config.rpath
+
autopoint ||
touch config.rpath
}
}
-do_stage() {
- autotools_stage_all
+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
+ done
}
# This construction is stupid, someone with more E knowledge should change it to =+ or something
}
# This construction is stupid, someone with more E knowledge should change it to =+ or something
@@
-42,7
+45,9
@@
FILES_${PN}-dev += "${bindir}/${PN}-config \
${libdir}/lib*.la \
${libdir}/*.so \
${libdir}/${PN}/*.la \
${libdir}/lib*.la \
${libdir}/*.so \
${libdir}/${PN}/*.la \
- ${libdir}/${PN}/*/*.la"
+ ${libdir}/${PN}/*/*.la \
+ ${datadir}/${PN}/edje_externals \
+"
FILES_${PN}-static += "${libdir}/${PN}/*.a \
${libdir}/${PN}/*/*.a \
FILES_${PN}-static += "${libdir}/${PN}/*.a \
${libdir}/${PN}/*/*.a \