diff options
| author | Phil Blundell <philb@gnu.org> | 2004-09-18 23:42:47 +0000 |
|---|---|---|
| committer | Phil Blundell <philb@gnu.org> | 2004-09-18 23:42:47 +0000 |
| commit | 854db9009aadab6558ebb65615119d2e4424719d (patch) | |
| tree | 0b59ff7929243bf478b476f75da13d6c6e944b04 /qt/qt-x11-free_3.3.2.oe | |
| parent | e2d3b5ba5656365b50df2b9fd2c2592fdf495bc3 (diff) | |
enable mysql plugin, needed for mythtv
BKrev: 414cc7f7T2xT1RXcBRyytswL6jz6Qw
Diffstat (limited to 'qt/qt-x11-free_3.3.2.oe')
| -rw-r--r-- | qt/qt-x11-free_3.3.2.oe | 31 |
1 files changed, 24 insertions, 7 deletions
diff --git a/qt/qt-x11-free_3.3.2.oe b/qt/qt-x11-free_3.3.2.oe index ec9421a012..f5049e2963 100644 --- a/qt/qt-x11-free_3.3.2.oe +++ b/qt/qt-x11-free_3.3.2.oe @@ -3,14 +3,17 @@ SECTION = "libs" PRIORITY = "optional" LICENSE = "GPL/QPL" MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" -DEPENDS = "uicmoc3-native freetype x11 xft xext libxrender libxrandr libxcursor" -PR = "r3" +DEPENDS = "uicmoc3-native freetype x11 xft xext libxrender libxrandr libxcursor mysql" +PR = "r4" SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-free-${PV}.tar.bz2 \ file://configure.patch;patch=1 \ file://no-examples.patch;patch=1" S = "${WORKDIR}/qt-x11-free-${PV}" +PACKAGES += "qt-x11-plugins" +FILES_qt-x11-plugins = "${prefix}/plugins" + inherit qmake-base export QTDIR = "${S}" @@ -18,27 +21,34 @@ ARCH_i686 = "x86" EXTRA_OEMAKE = "-e" QT_CONFIG_FLAGS = "-release -shared -qt-zlib -no-nas-sound -no-sm -qt-libpng -no-gif -no-xinerama \ - -no-tablet -no-xkb -no-dlopen-opengl -no-nis -no-cups -thread" + -no-tablet -no-xkb -no-dlopen-opengl -no-nis -no-cups -thread -plugin-sql-mysql -verbose" do_configure() { echo "yes" | ./configure -prefix ${prefix} ${QT_CONFIG_FLAGS} -fast \ - -L${STAGING_LIBDIR} -I${STAGING_INCDIR} -I${STAGING_INCDIR}/freetype2 + -L${STAGING_LIBDIR} -I${STAGING_INCDIR} -I${STAGING_INCDIR}/freetype2 -I${STAGING_INCDIR}/mysql # force regenerate - rm src/qtmain.pro + rm -f src/qtmain.pro cat Makefile >makefile find . -name "Makefile"|xargs rm -f - cd src && qmake -spec ${QMAKESPEC} + (cd src && qmake -spec ${QMAKESPEC} ) + (cd plugins/src && qmake -spec ${QMAKESPEC} ) } do_compile() { unset CFLAGS unset CXXFLAGS # cd src && oe_runmake QMAKESPEC="${QMAKESPEC}" QMAKE="${STAGING_BINDIR}/qmake" MOC="moc3" UIC="uic3" MAKE="make -e" - cd src && oe_runmake \ + oe_runmake -C src \ QMAKE="${STAGING_BINDIR}/qmake -after INCPATH+=${STAGING_INCDIR} \ INCPATH+=${STAGING_INCDIR}/freetype2 LIBS+=-L${STAGING_LIBDIR}" \ QMAKESPEC="${QMAKESPEC}" LINK="${CXX} -Wl,-rpath-link,${STAGING_LIBDIR}" \ MOC="${STAGING_BINDIR}/moc3" UIC="${STAGING_BINDIR}/uic3" MAKE="make -e" + oe_runmake -C plugins/src \ + QMAKE="${STAGING_BINDIR}/qmake -after INCPATH+=${STAGING_INCDIR} \ + INCPATH+=${STAGING_INCDIR}/freetype2 LIBS+=-L${STAGING_LIBDIR} \ + QMAKE_LIBS_QT=-lqt QMAKE_LIBS_QT_THREAD=-lqt-mt" \ + QMAKESPEC="${QMAKESPEC}" LINK="${CXX} -Wl,-rpath-link,${STAGING_LIBDIR}" \ + MOC="${STAGING_BINDIR}/moc3" UIC="${STAGING_BINDIR}/uic3" MAKE="make -e" } do_stage() { @@ -57,4 +67,11 @@ do_stage() { do_install() { install -d ${D}/${libdir}/ oe_soinstall lib/libqt-mt.so.${PV} ${D}/${libdir}/ + oe_runmake -C plugins/src INSTALL_ROOT="${D}" \ + QMAKE="${STAGING_BINDIR}/qmake -after INCPATH+=${STAGING_INCDIR} \ + INCPATH+=${STAGING_INCDIR}/freetype2 LIBS+=-L${STAGING_LIBDIR} \ + QMAKE_LIBS_QT=-lqt QMAKE_LIBS_QT_THREAD=-lqt-mt" \ + QMAKESPEC="${QMAKESPEC}" LINK="${CXX} -Wl,-rpath-link,${STAGING_LIBDIR}" \ + MOC="${STAGING_BINDIR}/moc3" UIC="${STAGING_BINDIR}/uic3" MAKE="make -e" \ + install } |