summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
Diffstat (limited to 'packages')
-rw-r--r--packages/qte/qte_2.3.7.bb5
-rw-r--r--packages/qte/qte_2.3.9-snapshot.bb3
-rw-r--r--packages/qte/qte_4.0.0-b1.bb1
3 files changed, 6 insertions, 3 deletions
diff --git a/packages/qte/qte_2.3.7.bb b/packages/qte/qte_2.3.7.bb
index 0e86a1c1be..38439b8906 100644
--- a/packages/qte/qte_2.3.7.bb
+++ b/packages/qte/qte_2.3.7.bb
@@ -48,11 +48,12 @@ QTE_ARCH := "${@qte_arch(d)}"
EXTRA_OECONF_CONFIG = "-qconfig qpe"
EXTRA_OECONF = "-system-jpeg -system-libpng -system-zlib -no-qvfb -no-xft -no-vnc -gif \
-xplatform ${TARGET_OS}-${QTE_ARCH}-g++ ${EXTRA_OECONF_CONFIG} -depths 16,32"
-EXTRA_OEMAKE = "-e"
EXTRA_OECONF_beagle = "-system-jpeg -system-libpng -system-zlib -no-qvfb \
-no-xft -no-vnc -gif \
-xplatform ${TARGET_OS}-${QTE_ARCH}-g++ \
${EXTRA_OECONF_CONFIG} -depths 8,16,32 "
+EXTRA_OEMAKE = "-e"
+PARALLEL_MAKE = ""
#
# FIXME: Add more here
@@ -83,7 +84,7 @@ export SYSCONF_UIC = "${STAGING_BINDIR}/uic"
do_configure() {
for f in ${S}/configs/linux-*-g++-shared; do
sed -e 's,-linux-,-linux-uclibc-,g' < $f \
- > `echo $f | sed -e 's,linux-,linux-uclibc-,'`
+ > `dirname $f`/`basename $f | sed -e 's,linux-,linux-uclibc-,'`
done
echo yes | ./configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}"
}
diff --git a/packages/qte/qte_2.3.9-snapshot.bb b/packages/qte/qte_2.3.9-snapshot.bb
index f40de2be37..cdc00444b0 100644
--- a/packages/qte/qte_2.3.9-snapshot.bb
+++ b/packages/qte/qte_2.3.9-snapshot.bb
@@ -52,6 +52,7 @@ EXTRA_OECONF_CONFIG = "-qconfig qpe"
EXTRA_OECONF = "-system-jpeg -system-libpng -system-zlib -no-qvfb -no-xft -no-vnc -gif \
-xplatform ${TARGET_OS}-${QTE_ARCH}-g++ ${EXTRA_OECONF_CONFIG} -depths 8,16,32"
EXTRA_OEMAKE = "-e"
+PARALLEL_MAKE = ""
#
# FIXME: Add more here
@@ -84,7 +85,7 @@ export SYSCONF_UIC = "${STAGING_BINDIR}/uic"
do_configure() {
for f in ${S}/configs/linux-*-g++-shared; do
sed -e 's,-linux-,-linux-uclibc-,g' < $f \
- > `echo $f | sed -e 's,linux-,linux-uclibc-,'`
+ > `dirname $f`/`basename $f | sed -e 's,linux-,linux-uclibc-,'`
done
echo yes | ./configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}"
}
diff --git a/packages/qte/qte_4.0.0-b1.bb b/packages/qte/qte_4.0.0-b1.bb
index 72922bc381..6c1936adf8 100644
--- a/packages/qte/qte_4.0.0-b1.bb
+++ b/packages/qte/qte_4.0.0-b1.bb
@@ -63,6 +63,7 @@ EXTRA_OECONF = "-embedded ${QTE_ARCH} \
"
EXTRA_OEMAKE = "-e"
+PARALLEL_MAKE = ""
export EXTRA_CFLAGS = "-I${STAGING_INCDIR}"
export EXTRA_CXXFLAGS = "-I${STAGING_INCDIR}"