diff options
| author | Tomas Junnonen <tomas.junnonen@nokia.com> | 2010-06-02 14:03:47 +0300 |
|---|---|---|
| committer | Tomas Junnonen <tomas.junnonen@nokia.com> | 2010-06-02 14:12:57 +0300 |
| commit | 7c274d807830f9b5c19829b8a96476edc6a3a35d (patch) | |
| tree | b27a9ec8930474d7cbc3ef6c5289bd1b7e437d4a /configure | |
| parent | 23369cc835f78983fb2adf3f60cae5f935f70d6a (diff) | |
Fixes: NB#171747 - mmoc native binary does not work with qemu - causes build failures
RevBy: Tomas Junnonen
Details: Main configure file, mmoc releated files, src/common_top.pri
src/predeps.pri and some tst project files were modified
to use Qt/C++ mmoc script for i486 target and perl for
armel target
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 19 |
1 files changed, 17 insertions, 2 deletions
@@ -75,9 +75,11 @@ HAVE_GSTREAMER=no HAVE_DBUS=no HAVE_CONTENTACTION=no HAVE_N900=no - + OPT_SHADOW=maybe +IS_ARMEL=no + # initalize variables used for installation M_INSTALL_PREFIX=/usr/local M_INSTALL_SYSCONFDIR=/etc @@ -400,6 +402,10 @@ if [ $? -eq 0 ]; then HAVE_CONTENTACTION=no fi + if [ $SBOX_UNAME_MACHINE = "arm" ]; then + IS_ARMEL=yes + fi + fi @@ -549,6 +555,10 @@ if [ "$HAVE_N900" = "yes" ]; then MEEGOTOUCHCONFIG_DEPS="$MEEGOTOUCHCONFIG_DEPS HAVE_N900" fi +if [ "$IS_ARMEL" = "yes" ]; then + MEEGOTOUCHCONFIG_DEPS="$MEEGOTOUCHCONFIG_DEPS IS_ARMEL" +fi + cat >>"$MEEGOTOUCHCONFIG.tmp" <<EOF # Autogenerated by configure script @@ -598,6 +608,10 @@ else mv -f "$M_QMAKE_CACHE.tmp" "$M_QMAKE_CACHE" fi +M_MMOC_EXECUTABLE="mmoc" +if [ "$IS_ARMEL" = "yes" ]; then + M_MMOC_EXECUTABLE="mmoc.pl" +fi MEEGOTOUCH_DEFINES_PRF="$outpath/mkspecs/features/meegotouch_defines.prf" @@ -606,7 +620,8 @@ MEEGOTOUCH_DEFINES_PRF="$outpath/mkspecs/features/meegotouch_defines.prf" cat "$relpath/mkspecs/features/meegotouch_defines.prf.in" \ | sed -e "s,@@M_UNIX_INSTALL_PREFIX@@,$M_INSTALL_PREFIX,g" \ | sed -e "s,@@M_UNIX_INSTALL_SYSCONFDIR@@,$M_INSTALL_SYSCONFDIR,g" \ -| sed -e "s,@@M_UNIX_INSTALL_LIBDIR@@,$M_INSTALL_LIBDIR,g" > "$MEEGOTOUCH_DEFINES_PRF.tmp" +| sed -e "s,@@M_UNIX_INSTALL_LIBDIR@@,$M_INSTALL_LIBDIR,g" \ +| sed -e "s,@@M_MMOC_EXECUTABLE@@,$M_MMOC_EXECUTABLE,g" > "$MEEGOTOUCH_DEFINES_PRF.tmp" # replace meegotouch_defines.prf if it differs from the newly created temp file if cmp -s "$MEEGOTOUCH_DEFINES_PRF.tmp" "$MEEGOTOUCH_DEFINES_PRF"; then |