X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=classes%2Fefl.bbclass;h=14334571ce956da2d58807e2765a6b947b9956c3;hb=16f3fff44323bd6b4349d909667b51a2fef3f278;hp=bc4d9fe84b93ce1ba7dd37933a9d680d5f4d80aa;hpb=2a3a5812f4a2752fefc847d65d0a1b3ede3f0b4f;p=openembedded.git

diff --git a/classes/efl.bbclass b/classes/efl.bbclass
index bc4d9fe84b..14334571ce 100644
--- a/classes/efl.bbclass
+++ b/classes/efl.bbclass
@@ -7,17 +7,27 @@ S = "${WORKDIR}/${SRCNAME}"
 DEPENDS += "pkgconfig-native"
 
 # revision 0d93ec84b30bc1bee2caaee72d667f87bc468a70 made SRCDATE and hence PV go backwards, so we need to up PE to unbreak builds and feeds :(
-PE = "1"
+PE = "2"
+
+ARM_INSTRUCTION_SET = "arm"
 
-AUTOTOOLS_STAGE_PKGCONFIG = "1"
-# do NOT inherit pkgconfig here, see note in autotools_stage_all
 inherit autotools
 
-do_stage() {
-	autotools_stage_all
+# evas-native looks at this var, so keep it
+AUTOTOOLS_STAGE_PKGCONFIG = "1"
+
+do_configure_prepend() {
+	autopoint || touch config.rpath
 }
 
-PACKAGES = "${PN}-dbg ${PN} ${PN}-themes ${PN}-dev ${PN}-tests"
+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
+PACKAGES = "${PN}-dbg ${PN} ${PN}-themes ${PN}-dev ${PN}-doc ${PN}-tests ${PN}-static"
 
 FILES_${PN} = "${libdir}/*.so.*"
 
@@ -33,12 +43,15 @@ FILES_${PN}-themes = "${datadir}/${PN}/themes \
 FILES_${PN}-dev   += "${bindir}/${PN}-config \
                       ${libdir}/pkgconfig/* \
                       ${libdir}/lib*.la \
-                      ${libdir}/lib*.a \
                       ${libdir}/*.so \
-                      ${libdir}/${PN}/*.a \
                       ${libdir}/${PN}/*.la \
-                      ${libdir}/${PN}/*/*.a \
-                      ${libdir}/${PN}/*/*.la"
+                      ${libdir}/${PN}/*/*.la \
+                      ${datadir}/${PN}/edje_externals \
+"
+
+FILES_${PN}-static += "${libdir}/${PN}/*.a \
+                       ${libdir}/${PN}/*/*.a \
+"
 
 FILES_${PN}-dbg +=   "${libdir}/${PN}/.debug \
                       ${libdir}/${PN}/*/.debug"