summaryrefslogtreecommitdiff
path: root/recipes
diff options
context:
space:
mode:
authorJeremy Lainé <jeremy.laine@m4x.org>2009-04-24 08:02:44 +0200
committerJeremy Lainé <jeremy.laine@m4x.org>2009-04-24 08:02:44 +0200
commit9d54794e4edd80519e7c0ea47c0b107ab648c94f (patch)
tree5cbf4c561af79f56a68bfd025d179e9965614df4 /recipes
parent5677ff24dfa105e2aaee777c1652fb1a66c1e7a5 (diff)
qt4(-tools-native)?.inc: compatibility fixes for Qt 4.5.1
Diffstat (limited to 'recipes')
-rw-r--r--recipes/qt4/qt4-tools-native.inc2
-rw-r--r--recipes/qt4/qt4.inc2
2 files changed, 2 insertions, 2 deletions
diff --git a/recipes/qt4/qt4-tools-native.inc b/recipes/qt4/qt4-tools-native.inc
index df5afd3c15..75ce4e6f30 100644
--- a/recipes/qt4/qt4-tools-native.inc
+++ b/recipes/qt4/qt4-tools-native.inc
@@ -30,7 +30,7 @@ EXTRA_OECONF = "-prefix ${prefix} \
EXTRA_OEMAKE = " "
do_configure() {
- echo yes | LFLAGS="-L${STAGING_LIBDIR_NATIVE}" ./configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}"
+ (echo o; echo yes) | LFLAGS="-L${STAGING_LIBDIR_NATIVE}" ./configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}"
}
TOBUILD = "\
diff --git a/recipes/qt4/qt4.inc b/recipes/qt4/qt4.inc
index fb44e58faa..dede5cb43e 100644
--- a/recipes/qt4/qt4.inc
+++ b/recipes/qt4/qt4.inc
@@ -103,7 +103,7 @@ do_configure() {
echo "Examples=${bindir}/${QT_DIR_NAME}/examples" >> $QT_CONF_PATH
echo "Demos=${bindir}/${QT_DIR_NAME}/demos" >> $QT_CONF_PATH
- echo yes | ./configure -v \
+ (echo o; echo yes) | ./configure -v \
-prefix ${prefix} \
-bindir ${bindir} \
-libdir ${libdir} \