diff options
| author | nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net> | 2005-01-18 06:44:18 +0000 |
|---|---|---|
| committer | nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net> | 2005-01-18 06:44:18 +0000 |
| commit | 7d6574bc264fbca8bc317551c09a7588bd0b49a0 (patch) | |
| tree | f0e64f142a7913515345fa915f95ada71f39fc50 /packages | |
| parent | fbb14d6d3f6b35b66f39efed78d7836ea7110b28 (diff) | |
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded
2005/01/18 01:44:17-05:00 handhelds.org!kergoth
qte: Correct a bug in a sed script in the do_configure, and disable PARALLEL_MAKE.
2005/01/18 01:09:16-05:00 handhelds.org!kergoth
Properly mangle the messages for the BuildCompleted event.
2005/01/18 00:47:58-05:00 handhelds.org!kergoth
Fix the new base_do_patch application dir problem, again, hopefully for the last time.
BKrev: 41ecb042ECy_RNQJN4-AJGD_c8kZcQ
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/qte/qte_2.3.7.bb | 5 | ||||
| -rw-r--r-- | packages/qte/qte_2.3.9-snapshot.bb | 3 | ||||
| -rw-r--r-- | packages/qte/qte_4.0.0-b1.bb | 1 |
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}" |