diff options
| author | John Lee <john_lee@openmoko.org> | 2008-03-07 13:05:07 +0000 |
|---|---|---|
| committer | John Lee <john_lee@openmoko.org> | 2008-03-07 13:05:07 +0000 |
| commit | 0b098d35b319ed6c00f363cb0d4fd447d7fb8d57 (patch) | |
| tree | a830bf983a66688f5648cd83e362c4fea2f48f6b /classes | |
| parent | 06fb90eb31b0b85a5c5c7adf185ce2515c5b1220 (diff) | |
| parent | d3bbd28f22fbd8e9d097081fa128ae18197f36e1 (diff) | |
merge of '26501141207c84e31e0f43c5795a15c0f16dbce5'
and '86618f966282489d43b51fbf0ee93b954ac615ae'
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/autotools.bbclass | 1 | ||||
| -rw-r--r-- | classes/base.bbclass | 2 | ||||
| -rw-r--r-- | classes/native.bbclass | 2 | ||||
| -rw-r--r-- | classes/packaged-staging.bbclass | 5 | ||||
| -rw-r--r-- | classes/sdk.bbclass | 11 |
5 files changed, 11 insertions, 10 deletions
diff --git a/classes/autotools.bbclass b/classes/autotools.bbclass index 991e472b14..4f3e0b1c4d 100644 --- a/classes/autotools.bbclass +++ b/classes/autotools.bbclass @@ -17,6 +17,7 @@ def autotools_dep_prepend(d): deps += 'libtool-native ' if not bb.data.inherits_class('native', d) \ and not bb.data.inherits_class('cross', d) \ + and not bb.data.inherits_class('sdk', d) \ and not bb.data.getVar('INHIBIT_DEFAULT_DEPS', d, 1): deps += 'libtool-cross ' diff --git a/classes/base.bbclass b/classes/base.bbclass index 7609c05851..615d02d07e 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -1,4 +1,4 @@ -BB_DEFAULT_TASK = "build" +BB_DEFAULT_TASK ?= "build" # like os.path.join but doesn't treat absolute RHS specially def base_path_join(a, *p): diff --git a/classes/native.bbclass b/classes/native.bbclass index 8f2b6f3fec..63e9741397 100644 --- a/classes/native.bbclass +++ b/classes/native.bbclass @@ -1,5 +1,3 @@ -inherit base - # Native packages are built indirectly via dependency, # no need for them to be a direct target of 'world' EXCLUDE_FROM_WORLD = "1" diff --git a/classes/packaged-staging.bbclass b/classes/packaged-staging.bbclass index 29ce72d65c..b564136e3f 100644 --- a/classes/packaged-staging.bbclass +++ b/classes/packaged-staging.bbclass @@ -20,6 +20,9 @@ python () { bb.data.setVar("PSTAGING_DISABLED", "1", d) } +# multimachine.bbclass will override this +MULTIMACH_ARCH ?= "${PACKAGE_ARCH}" + export PSTAGING_DISABLED = "0" DEPLOY_DIR_PSTAGE = "${DEPLOY_DIR}/pstage" @@ -225,5 +228,5 @@ python do_package_stage () { bb.utils.unlockfile(lf) } -addtask package_stage after do_package_write_ipk do_package_write_deb do_package_write do_populate_staging before do_build +addtask package_stage after do_package_write do_populate_staging before do_build diff --git a/classes/sdk.bbclass b/classes/sdk.bbclass index 71c65a1629..cbc1742dab 100644 --- a/classes/sdk.bbclass +++ b/classes/sdk.bbclass @@ -6,16 +6,15 @@ OLD_PACKAGE_ARCH := ${PACKAGE_ARCH} PACKAGE_ARCH = "${BUILD_ARCH}-${OLD_PACKAGE_ARCH}-sdk" HOST_ARCH = "${BUILD_ARCH}" -# This isn't BUILD_VENDOR since we don't want to clash with native staging -HOST_VENDOR = "${TARGET_VENDOR}" +HOST_VENDOR = "${BUILD_VENDOR}" HOST_OS = "${BUILD_OS}" HOST_PREFIX = "${BUILD_PREFIX}" HOST_CC_ARCH = "${BUILD_CC_ARCH}" -CPPFLAGS = "${BUILDSDK_CPPFLAGS}" -CFLAGS = "${BUILDSDK_CFLAGS}" -CXXFLAGS = "${BUILDSDK_CFLAGS}" -LDFLAGS = "${BUILDSDK_LDFLAGS}" +CPPFLAGS = "${BUILD_CPPFLAGS}" +CFLAGS = "${BUILD_CFLAGS}" +CXXFLAGS = "${BUILD_CFLAGS}" +LDFLAGS = "${BUILD_LDFLAGS}" # Path prefixes prefix = "${SDK_PREFIX}" |