[oe-commits] Richard Purdie : native.bbclass: Force legacy staging mode autotools_stage_all is used as often the do_install is empty too . This fixes issues with curl-native

git version control git at git.openembedded.org
Thu Nov 12 10:37:21 UTC 2009


Module: openembedded.git
Branch: org.openembedded.dev
Commit: 43be9de6f9225760b6cd0f7dbf332a9adb22b7bc
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=43be9de6f9225760b6cd0f7dbf332a9adb22b7bc

Author: Richard Purdie <rpurdie at linux.intel.com>
Date:   Thu Nov 12 10:32:08 2009 +0000

native.bbclass: Force legacy staging mode autotools_stage_all is used as often the do_install is empty too. This fixes issues with curl-native

Signed-off-by: Richard Purdie <rpurdie at linux.intel.com>

---

 classes/native.bbclass |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/classes/native.bbclass b/classes/native.bbclass
index 6292e4b..89f6501 100644
--- a/classes/native.bbclass
+++ b/classes/native.bbclass
@@ -87,7 +87,12 @@ DEPENDS_virtclass-native ?= "${ORIG_DEPENDS}"
 python __anonymous () {
     # If we've a legacy native do_stage, we need to neuter do_install
     stagefunc = bb.data.getVar('do_stage', d, True)
-    if (stagefunc.strip() != "do_stage_native" and stagefunc.strip() != "autotools_stage_all") and bb.data.getVar('AUTOTOOLS_NATIVE_STAGE_INSTALL', d, 1) == "1":
+
+    # For now, force legacy mode for native packages using autotools_stage_all
+    if (stagefunc.strip() == "autotools_stage_all"):
+        bb.note("Forcing legacy staging mode for %s" % bb.data.getVar('FILE', d, 1))
+        bb.data.setVar('FORCE_LEGACY_STAGING', "1", d)
+    elif (stagefunc.strip() != "do_stage_native" and stagefunc.strip() != "autotools_stage_all") and bb.data.getVar('AUTOTOOLS_NATIVE_STAGE_INSTALL', d, 1) == "1":
         bb.data.setVar("do_install", "      :", d)
 
     if "native" in (bb.data.getVar('BBCLASSEXTEND', d, True) or ""):





More information about the Openembedded-commits mailing list