diff options
| author | Marcin Juszkiewicz <hrw@openembedded.org> | 2007-12-19 13:27:04 +0000 |
|---|---|---|
| committer | Marcin Juszkiewicz <hrw@openembedded.org> | 2007-12-19 13:27:04 +0000 |
| commit | 341125a0b12b9ba46b3587d5d4b95a6f11beaaae (patch) | |
| tree | 0f1b32f58c2045f8cd9683525cfb5e20341781cb /packages | |
| parent | 6f018366d3b7fdfee797c561c8340758a543b831 (diff) | |
| parent | 811a2595f5edadf001da84f6c9fe2f99bb31a798 (diff) | |
merge of 'aa908f9edf3bb81b538c3115f62602d8a40d01df'
and 'd99a2eec5529a214f0a05a5ffe3a8697d12c08f0'
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/qt/qt4-x11-free_4.1.2.bb | 1 | ||||
| -rw-r--r-- | packages/qt/qt4-x11-free_4.3.2.bb | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/packages/qt/qt4-x11-free_4.1.2.bb b/packages/qt/qt4-x11-free_4.1.2.bb index 91ac3f68cf..77fa6dba12 100644 --- a/packages/qt/qt4-x11-free_4.1.2.bb +++ b/packages/qt/qt4-x11-free_4.1.2.bb @@ -70,6 +70,7 @@ PARTS = "3Support Core Designer DesignerComponents Gui Network Sql Svg Test Xml" do_stage() { oe_runmake install INSTALL_ROOT=/ + install -d ${STAGING_QT_DIR} install -m 0755 ${STAGING_BINDIR_NATIVE}/rcc4 ${STAGING_QT_DIR}/bin/rcc install -m 0755 ${STAGING_BINDIR_NATIVE}/moc4 ${STAGING_QT_DIR}/bin/moc install -m 0755 ${STAGING_BINDIR_NATIVE}/uic4 ${STAGING_QT_DIR}/bin/uic diff --git a/packages/qt/qt4-x11-free_4.3.2.bb b/packages/qt/qt4-x11-free_4.3.2.bb index a097c4e9ca..9b4c6be18c 100644 --- a/packages/qt/qt4-x11-free_4.3.2.bb +++ b/packages/qt/qt4-x11-free_4.3.2.bb @@ -62,7 +62,7 @@ do_configure() { # FIXME: Might want to compile the cross tools for the -dev packages as well... do_compile() { - unset CFLAGS CXXFLAGS + unset CFLAGS CXXFLAGSi install -m 0755 ${STAGING_BINDIR_NATIVE}/rcc4 ${S}/bin/rcc install -m 0755 ${STAGING_BINDIR_NATIVE}/moc4 ${S}/bin/moc install -m 0755 ${STAGING_BINDIR_NATIVE}/uic4 ${S}/bin/uic @@ -74,6 +74,7 @@ PARTS = "3Support AssistantClient Core DBus Designer DesignerComponents Gui Netw do_stage() { oe_runmake install INSTALL_ROOT=/ + install -d ${STAGING_QT_DIR} install -m 0755 ${STAGING_BINDIR_NATIVE}/rcc4 ${STAGING_QT_DIR}/bin/rcc install -m 0755 ${STAGING_BINDIR_NATIVE}/moc4 ${STAGING_QT_DIR}/bin/moc install -m 0755 ${STAGING_BINDIR_NATIVE}/uic4 ${STAGING_QT_DIR}/bin/uic |