summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2008-03-19 15:35:13 +0000
committerRichard Purdie <richard@openedhand.com>2008-03-19 15:35:13 +0000
commit38854a11011a6bed662a09214356d1aaace9fd7a (patch)
treedb7496733477c74c7e722080b1b9b2ed6ff5b3c8 /meta
parent90552a3545d1db29f95a1dc9e4ec9b7f68084bcc (diff)
downloadpoky-38854a11011a6bed662a09214356d1aaace9fd7a.tar.gz
autotools.bbclass/native.bbclass: Use autotools_stage_all instead of oe_runmake install for staging autotooled native packages (from OE.dev)
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4056 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/autotools.bbclass3
-rw-r--r--meta/classes/native.bbclass9
2 files changed, 9 insertions, 3 deletions
diff --git a/meta/classes/autotools.bbclass b/meta/classes/autotools.bbclass
index 733ee81e14..7a87cc0bf8 100644
--- a/meta/classes/autotools.bbclass
+++ b/meta/classes/autotools.bbclass
@@ -1,5 +1,8 @@
1inherit base 1inherit base
2 2
3# use autotools_stage_all for native packages
4AUTOTOOLS_NATIVE_STAGE_INSTALL = "1"
5
3def autotools_dep_prepend(d): 6def autotools_dep_prepend(d):
4 import bb; 7 import bb;
5 8
diff --git a/meta/classes/native.bbclass b/meta/classes/native.bbclass
index 8f2b6f3fec..ddbbc04e19 100644
--- a/meta/classes/native.bbclass
+++ b/meta/classes/native.bbclass
@@ -1,5 +1,3 @@
1inherit base
2
3# Native packages are built indirectly via dependency, 1# Native packages are built indirectly via dependency,
4# no need for them to be a direct target of 'world' 2# no need for them to be a direct target of 'world'
5EXCLUDE_FROM_WORLD = "1" 3EXCLUDE_FROM_WORLD = "1"
@@ -78,7 +76,12 @@ export oldincludedir = "${STAGING_DIR_NATIVE}${layout_includedir}"
78do_stage () { 76do_stage () {
79 if [ "${INHIBIT_NATIVE_STAGE_INSTALL}" != "1" ] 77 if [ "${INHIBIT_NATIVE_STAGE_INSTALL}" != "1" ]
80 then 78 then
81 oe_runmake install 79 if [ "${AUTOTOOLS_NATIVE_STAGE_INSTALL}" != "1"]
80 then
81 oe_runmake install
82 else
83 autotools_stage_all
84 fi
82 fi 85 fi
83} 86}
84 87