summaryrefslogtreecommitdiff
path: root/qte/qte_2.3.6.oe
diff options
context:
space:
mode:
Diffstat (limited to 'qte/qte_2.3.6.oe')
-rw-r--r--qte/qte_2.3.6.oe18
1 files changed, 10 insertions, 8 deletions
diff --git a/qte/qte_2.3.6.oe b/qte/qte_2.3.6.oe
index a4e4ee1600..86607ea555 100644
--- a/qte/qte_2.3.6.oe
+++ b/qte/qte_2.3.6.oe
@@ -30,28 +30,30 @@ EXTRA_OEMAKE = -e
export SYSCONF_CC = ${CC}
export SYSCONF_CXX = ${CXX}
-export SYSCONF_LINK = ${CC}
-export SYSCONF_SHLIB = ${CC}
+export SYSCONF_LINK = ${CCLD}
+export SYSCONF_SHLIB = ${CCLD}
export SYSCONF_CFLAGS = ${CFLAGS}
export SYSCONF_CXXFLAGS = ${CXXFLAGS} -pipe -DQWS -fno-exceptions -fno-rtti -DNO_DEBUG
export SYSCONF_LFLAGS = ${LDFLAGS}
-do_compile() {
- unset CC CXX LD LINK CPP CFLAGS CXXFLAGS LDFLAGS
+do_configure() {
if [ "$BUILD_ARCH" = "i686" ]; then
BUILD_ARCH=x86
fi
echo yes | ./configure -platform $BUILD_OS-$BUILD_ARCH-g++ $EXTRA_OECONF || die "Configuring qt failed"
+}
+
+do_compile() {
+ unset CC LD CCLD CXX RANLIB AR STRIP CFLAGS LDFLAGS CXXFLAGS CPPFLAGS
(
cd src/moc
export SYSCONF_CXX="${BUILD_CXX}"
export SYSCONF_CC="${BUILD_CC}"
- export SYSCONF_LINK="${BUILD_CC}"
+ export SYSCONF_LINK="${BUILD_CCLD}"
export SYSCONF_SHLIB="${BUILD_CC}"
- unset SYSCONF_CFLAGS SYSCONF_CXXFLAGS SYSCONF_LFLAGS CROSS
+ unset SYSCONF_CFLAGS SYSCONF_CXXFLAGS SYSCONF_LFLAGS
oe_runmake
- )
- cd ${S}
+ ) || die "Building moc failed"
oe_runmake
}