diff options
| author | Leon Woestenberg <leon.woestenberg@gmail.com> | 2007-05-17 17:01:42 +0000 |
|---|---|---|
| committer | Leon Woestenberg <leon.woestenberg@gmail.com> | 2007-05-17 17:01:42 +0000 |
| commit | 09d0c6da109b9c875800dd46ff7d848c153322f4 (patch) | |
| tree | 7f7b769c987a65cc38bc27ca396ee0e5cc95cf8c /classes | |
| parent | 1a7668c797a0ce8728190d641c3a87d2e9ee312a (diff) | |
| parent | 7605d989539a54cb2e6a00fba7cd3943bb9be7ec (diff) | |
merge of '0b283e6731fcecb8efe6007eaa4798a26df1938a'
and '49e541f0397109bdc6530a7380f2980a60d577ba'
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/autotools.bbclass | 4 | ||||
| -rw-r--r-- | classes/gtk-icon-cache.bbclass | 1 | ||||
| -rw-r--r-- | classes/insane.bbclass | 2 | ||||
| -rw-r--r-- | classes/sdk.bbclass | 6 |
4 files changed, 11 insertions, 2 deletions
diff --git a/classes/autotools.bbclass b/classes/autotools.bbclass index 33546e0eb6..3c555751da 100644 --- a/classes/autotools.bbclass +++ b/classes/autotools.bbclass @@ -15,6 +15,10 @@ def autotools_dep_prepend(d): if not pn in ['libtool', 'libtool-native', 'libtool-cross']: deps += 'libtool-native ' + if not bb.data.inherits_class('native', d) \ + and not bb.data.inherits_class('cross', d) \ + and not bb.data.getVar('INHIBIT_DEFAULT_DEPS', d, 1): + deps += 'libtool-cross ' return deps + 'gnu-config-native ' diff --git a/classes/gtk-icon-cache.bbclass b/classes/gtk-icon-cache.bbclass index 0f68e6812b..855a72a2f7 100644 --- a/classes/gtk-icon-cache.bbclass +++ b/classes/gtk-icon-cache.bbclass @@ -1,4 +1,5 @@ FILES_${PN} += "${datadir}/icons/hicolor" +RDEPENDS += " hicolor-icon-theme " gtk-icon-cache_postinst() { if [ "x$D" != "x" ]; then diff --git a/classes/insane.bbclass b/classes/insane.bbclass index 385db31784..9f243c8c9a 100644 --- a/classes/insane.bbclass +++ b/classes/insane.bbclass @@ -273,7 +273,7 @@ def package_qa_check_arch(path,name,d): target_arch = bb.data.getVar('TARGET_ARCH', d, True) # FIXME: Cross package confuse this check, so just skip them - if bb.data.inherits_class('cross', d): + if bb.data.inherits_class('cross', d) or bb.data.inherits_class('sdk', d): return True # avoid following links to /usr/bin (e.g. on udev builds) diff --git a/classes/sdk.bbclass b/classes/sdk.bbclass index bcabbc79bd..834081fccc 100644 --- a/classes/sdk.bbclass +++ b/classes/sdk.bbclass @@ -20,7 +20,11 @@ prefix = "/usr/local/${SDK_NAME}" exec_prefix = "${prefix}" base_prefix = "${exec_prefix}" -FILES_${PN} = "${prefix}" +PACKAGES =+ "${PN}-dbg" +FILES_${PN} = "${prefix}" +FILES_${PN}-dbg += "${prefix}/bin/.debug \ + ${prefix}/sbin/.debug \ + " |