summaryrefslogtreecommitdiff
path: root/classes/e.bbclass
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@rpsys.net>2006-12-31 22:31:24 +0000
committerRichard Purdie <rpurdie@rpsys.net>2006-12-31 22:31:24 +0000
commit9bd213b23e9095cc0aa94952cc345a110a5cdc40 (patch)
tree4f862fbb29bc438fe7f45f679934a4ec0b91a436 /classes/e.bbclass
parentbbd81bb3d973f809636c55c56bdc5b6ec863bfa0 (diff)
Split STAGING_BINDIR into CROSS and NATIVE versions. This means there is no need to rename -config scripts and multimachine won't break with binconfig.bbclass. ***NOTE: This change will require staging to be rebuilt***
Diffstat (limited to 'classes/e.bbclass')
-rw-r--r--classes/e.bbclass30
1 files changed, 13 insertions, 17 deletions
diff --git a/classes/e.bbclass b/classes/e.bbclass
index ae8fea0d5d..f20c1f8b60 100644
--- a/classes/e.bbclass
+++ b/classes/e.bbclass
@@ -8,23 +8,19 @@ do_prepsources () {
}
addtask prepsources after do_fetch before do_unpack
-def binconfig_suffix(d):
- import bb
- return ["","-native"][bb.data.inherits_class('native', d)]
-
-export CURL_CONFIG = "${STAGING_BINDIR}/curl-config${@binconfig_suffix(d)}"
-export EDB_CONFIG = "${STAGING_BINDIR}/edb-config${@binconfig_suffix(d)}"
-export EET_CONFIG = "${STAGING_BINDIR}/eet-config${@binconfig_suffix(d)}"
-export EVAS_CONFIG = "${STAGING_BINDIR}/evas-config${@binconfig_suffix(d)}"
-export ECORE_CONFIG = "${STAGING_BINDIR}/ecore-config${@binconfig_suffix(d)}"
-export EMBRYO_CONFIG = "${STAGING_BINDIR}/embryo-config${@binconfig_suffix(d)}"
-export ENGRAVE_CONFIG = "${STAGING_BINDIR}/engrave-config${@binconfig_suffix(d)}"
-export ENLIGHTENMENT_CONFIG = "${STAGING_BINDIR}/enlightenment-config${@binconfig_suffix(d)}"
-export EPSILON_CONFIG = "${STAGING_BINDIR}/epsilon-config${@binconfig_suffix(d)}"
-export EPEG_CONFIG = "${STAGING_BINDIR}/epeg-config${@binconfig_suffix(d)}"
-export ESMART_CONFIG = "${STAGING_BINDIR}/esmart-config${@binconfig_suffix(d)}"
-export FREETYPE_CONFIG = "${STAGING_BINDIR}/freetype-config${@binconfig_suffix(d)}"
-export IMLIB2_CONFIG = "${STAGING_BINDIR}/imlib2-config${@binconfig_suffix(d)}"
+export CURL_CONFIG = "${STAGING_BINDIR_CROSS}/curl-config"
+export EDB_CONFIG = "${STAGING_BINDIR_CROSS}/edb-config"
+export EET_CONFIG = "${STAGING_BINDIR_CROSS}/eet-config"
+export EVAS_CONFIG = "${STAGING_BINDIR_CROSS}/evas-config"
+export ECORE_CONFIG = "${STAGING_BINDIR_CROSS}/ecore-config"
+export EMBRYO_CONFIG = "${STAGING_BINDIR_CROSS}/embryo-config"
+export ENGRAVE_CONFIG = "${STAGING_BINDIR_CROSS}/engrave-config"
+export ENLIGHTENMENT_CONFIG = "${STAGING_BINDIR_CROSS}/enlightenment-config"
+export EPSILON_CONFIG = "${STAGING_BINDIR_CROSS}/epsilon-config"
+export EPEG_CONFIG = "${STAGING_BINDIR_CROSS}/epeg-config"
+export ESMART_CONFIG = "${STAGING_BINDIR_CROSS}/esmart-config"
+export FREETYPE_CONFIG = "${STAGING_BINDIR_CROSS}/freetype-config"
+export IMLIB2_CONFIG = "${STAGING_BINDIR_CROSS}/imlib2-config"
do_compile_prepend() {
find ${S} -name Makefile | xargs sed -i 's:/usr/include:${STAGING_INCDIR}:'