diff options
| author | Holger Freyther <zecke@selfish.org> | 2007-12-24 12:41:20 +0000 |
|---|---|---|
| committer | Holger Freyther <zecke@selfish.org> | 2007-12-24 12:41:20 +0000 |
| commit | 65a0e7358915f95d64d2df033843e83b82ffd83f (patch) | |
| tree | 4b9666cd21fe5cff7d40cf74263e4c798f3ba3a0 /packages/qt4/qt4-x11-free_4.3.3.bb | |
| parent | 31e33a19636ee3c236526f232696fee13ecc76ef (diff) | |
packages/qt4/qt4-x11-free,qtopia-core: Unify configure and compile of Qt4
Adjust packaging to look into the directories we configured.
Diffstat (limited to 'packages/qt4/qt4-x11-free_4.3.3.bb')
| -rw-r--r-- | packages/qt4/qt4-x11-free_4.3.3.bb | 41 |
1 files changed, 1 insertions, 40 deletions
diff --git a/packages/qt4/qt4-x11-free_4.3.3.bb b/packages/qt4/qt4-x11-free_4.3.3.bb index b8876541b6..8b557a086c 100644 --- a/packages/qt4/qt4-x11-free_4.3.3.bb +++ b/packages/qt4/qt4-x11-free_4.3.3.bb @@ -1,50 +1,11 @@ -PARALLEL_MAKE = "" -export QTDIR = "${S}" STAGING_QT_DIR = "${STAGING_DIR}/${TARGET_SYS}/qt4" -EXTRA_OEMAKE = "-e" -require qt4_arch.inc -QT_ARCH := "${@qt_arch(d)}" # FIXME: # * add missing options -QT_CONFIG_FLAGS = "-release -shared -qt-zlib -system-libjpeg -no-nas-sound -no-sm -no-libmng -qt-libpng -no-gif -no-xinerama \ - -no-tablet -no-xkb -no-nis -no-cups -no-opengl \ - -no-sse -no-sse2 -no-mmx -no-3dnow \ - -no-sql-ibase -no-sql-mysql -no-sql-odbc -no-sql-psql -no-sql-sqlite -no-sql-sqlite2 \ - -qdbus \ - -verbose -stl -no-accessibility \ - -pch -no-glib" +QT_CONFIG_FLAGS += "-no-xinerama -no-tablet -no-xkb -no-opengl" -EXTRA_ENV = 'QMAKE="${STAGING_BINDIR_NATIVE}/qmake2 -after DEFINES+=QT_NO_XIM INCPATH+=${STAGING_INCDIR} \ - INCPATH+=${STAGING_INCDIR}/freetype2 LIBS+=-L${STAGING_LIBDIR}" \ - QMAKESPEC="${QMAKESPEC}" LINK="${CXX} -Wl,-rpath-link,${STAGING_LIBDIR}" \ - AR="${TARGET_PREFIX}ar cqs" \ - MOC="${STAGING_BINDIR_NATIVE}/moc4" UIC="${STAGING_BINDIR_NATIVE}/uic4" MAKE="make -e"' - -do_configure() { - echo "DEFINES -= QT_NO_CAST_TO_ASCII" >>src/qbase.pri - echo "DEFINES += QT_NO_XIM" >>src/qbase.pri - unset QMAKESPEC - ln -sf ${STAGING_BINDIR_NATIVE}/qmake2 bin/qmake - ln -s linux-g++ mkspecs/${TARGET_OS}-oe-g++ - #export QMAKESPEC="linux-oe-g++" - #rm -rf ./mkspecs - #ln -sf ${QMAKE_MKSPEC_PATH} ./mkspecs - echo yes | ./configure -prefix / -platform ${TARGET_OS}-oe-g++ -crossarch ${QT_ARCH} ${QT_CONFIG_FLAGS} -fast \ - -L${STAGING_LIBDIR} -I${STAGING_INCDIR} -I${STAGING_INCDIR}/freetype2 -I${STAGING_INCDIR}/mysql -} - -# FIXME: Might want to compile the cross tools for the -dev packages as well... -do_compile() { - unset CFLAGS CXXFLAGS - install -m 0755 ${STAGING_BINDIR_NATIVE}/rcc4 ${S}/bin/rcc - install -m 0755 ${STAGING_BINDIR_NATIVE}/moc4 ${S}/bin/moc - install -m 0755 ${STAGING_BINDIR_NATIVE}/uic4 ${S}/bin/uic - - oe_runmake ${EXTRA_ENV} -} PARTS = "3Support AssistantClient Core DBus Designer DesignerComponents Gui Network Script Sql Svg Test Xml" |