diff options
| author | Daniel Willmann <daniel@totalueberwachung.de> | 2007-12-16 14:21:22 +0000 |
|---|---|---|
| committer | Daniel Willmann <daniel@totalueberwachung.de> | 2007-12-16 14:21:22 +0000 |
| commit | 958223597d9f9c2fd09fcb8befc68f129ce5c2d8 (patch) | |
| tree | 24c05b8f0605759347ef4a5dce642489ea6fdf33 /classes | |
| parent | fe379ffc9b1b75ba62a68f5bc21b854e5da49259 (diff) | |
| parent | ae6f2adfc12c8ec00cf1cd644f87c8c4ca107e5a (diff) | |
merge of '838eb6a07e13b6913dd7a7eebee5e18544c4e6ae'
and 'c4c17ca83d23bc51028aa72cd2f94ead9497b597'
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/base.bbclass | 6 | ||||
| -rw-r--r-- | classes/package.bbclass | 10 | ||||
| -rw-r--r-- | classes/sanity.bbclass | 5 | ||||
| -rw-r--r-- | classes/sip.bbclass | 2 |
4 files changed, 20 insertions, 3 deletions
diff --git a/classes/base.bbclass b/classes/base.bbclass index 7526dff65e..2b508a8e84 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -848,6 +848,12 @@ def base_after_parse(d): bb.data.delVarFlag('MACHINE', 'export', d) bb.data.setVarFlag('MACHINE', 'unexport', 1, d) + # Make sure TARGET_ARCH isn't exported + # (breaks Makefiles using implicit rules, e.g. quilt, as GNU make has this + # in them, undocumented) + bb.data.delVarFlag('TARGET_ARCH', 'export', d) + bb.data.setVarFlag('TARGET_ARCH', 'unexport', 1, d) + # Make sure DISTRO isn't exported # (breaks sysvinit at least) bb.data.delVarFlag('DISTRO', 'export', d) diff --git a/classes/package.bbclass b/classes/package.bbclass index 67aeb33a13..37b9d83d97 100644 --- a/classes/package.bbclass +++ b/classes/package.bbclass @@ -694,6 +694,16 @@ python package_do_shlibs() { for l in lines: shlib_provider[l.rstrip()] = (dep_pkg, lib_ver) + assumed_libs = bb.data.getVar('ASSUME_SHLIBS', d, 1) + if assumed_libs: + for e in assumed_libs.split(): + l, dep_pkg = e.split(":") + lib_ver = None + dep_pkg = dep_pkg.rsplit("_", 1) + if len(dep_pkg) == 2: + lib_ver = dep_pkg[1] + dep_pkg = dep_pkg[0] + shlib_provider[l] = (dep_pkg, lib_ver) for pkg in packages.split(): bb.debug(2, "calculating shlib requirements for %s" % pkg) diff --git a/classes/sanity.bbclass b/classes/sanity.bbclass index 479abce7fa..cc413b7011 100644 --- a/classes/sanity.bbclass +++ b/classes/sanity.bbclass @@ -70,8 +70,9 @@ def check_sanity(e): if "diffstat-native" not in assume_provided: messages = messages + 'Please use ASSUME_PROVIDED +=, not ASSUME_PROVIDED = in your local.conf\n' - # Check that the MACHINE is valid - if not check_conf_exists("conf/machine/${MACHINE}.conf", e.data): + # Check that the MACHINE is valid, if it is set + if data.getVar('MACHINE', e.data, True): + if not check_conf_exists("conf/machine/${MACHINE}.conf", e.data): messages = messages + 'Please set a valid MACHINE in your local.conf\n' # Check that the DISTRO is valid diff --git a/classes/sip.bbclass b/classes/sip.bbclass index 6f77f460dc..ae186bd04a 100644 --- a/classes/sip.bbclass +++ b/classes/sip.bbclass @@ -4,7 +4,7 @@ # yes, python-sip is actually a build-time dependency, since # the recipe installs sip.h -DEPENDS =+ "sip-native python-sip" +DEPENDS += "sip-native python-sip" # default stuff, do not uncomment # EXTRA_SIPTAGS = "-tWS_X11 -tQt_4_3_0" |