diff options
| author | Rolf Leggewie <oe-devel@rolf.leggewie.biz> | 2007-12-14 14:14:45 +0000 |
|---|---|---|
| committer | Rolf Leggewie <oe-devel@rolf.leggewie.biz> | 2007-12-14 14:14:45 +0000 |
| commit | 1a43f7bfb4c74b60df85ef0d681fd24adc22fe26 (patch) | |
| tree | e503acf5d75f3c50d085fec1ee4ad2a108cbef3e /classes | |
| parent | 8e148d8850646c085f55247d06eb1c5a09a56e85 (diff) | |
| parent | 0a080ee0fd673cc529dda6e9f464de6b011e58ca (diff) | |
merge of '7a5a4709034423139d7001ca7861c3d0ac73e140'
and 'b0e1f4cc3e0bf1bed8a04464efb7be20824683fa'
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/scons.bbclass | 1 | ||||
| -rw-r--r-- | classes/sip.bbclass | 2 | ||||
| -rw-r--r-- | classes/sourcepkg.bbclass | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/classes/scons.bbclass b/classes/scons.bbclass index 534b3bd4c7..6d0a783dc2 100644 --- a/classes/scons.bbclass +++ b/classes/scons.bbclass @@ -6,6 +6,7 @@ scons_do_compile() { } scons_do_install() { + install -d ${D}${prefix} ${STAGING_BINDIR_NATIVE}/scons PREFIX=${D}${prefix} prefix=${D}${prefix} install || \ oefatal "scons install execution failed." } 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" diff --git a/classes/sourcepkg.bbclass b/classes/sourcepkg.bbclass index 390d3684d4..bbc9f187ec 100644 --- a/classes/sourcepkg.bbclass +++ b/classes/sourcepkg.bbclass @@ -106,6 +106,6 @@ EXPORT_FUNCTIONS do_create_orig_tgz do_archive_bb do_dumpdata do_create_diff_gz addtask create_orig_tgz after do_unpack before do_patch addtask archive_bb after do_patch before do_dumpdata -addtask dumpdata after archive_bb before do_create_diff_gz +addtask dumpdata after do_archive_bb before do_create_diff_gz addtask create_diff_gz after do_dump_data before do_configure |