diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2004-09-29 16:03:54 +0000 |
|---|---|---|
| committer | Michael Lauer <mickey@vanille-media.de> | 2004-09-29 16:03:54 +0000 |
| commit | e7accf1d04937aafeda19cf5575398465a7ccd5c (patch) | |
| tree | 86a71fd37ec01c58e77d1a67e66daa151484a836 /classes | |
| parent | 69d94698c98150c9cc32ee8a14bc29b8ea3766c9 (diff) | |
Merge bk://openembedded@openembedded.bkbits.net/packages
into gandalf.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages
2004/09/29 18:03:23+02:00 uni-frankfurt.de!mickeyl
konqueror and libqpe-opie: catch up with qt staging changes
2004/09/29 18:02:28+02:00 uni-frankfurt.de!mickeyl
first bits for the qt2/qt3 split. Notes: a) qte2 is default, so no changes should be necessary for packages using the qmake or qmake-derived oeclasses. b) overriding QTDIR is no longer supported, remove that from your .oe files. c) manual changes for non-qmake packages can be necessary. d) inherit qt3x11 to configure qmake for Qt3/X11 (sic)
2004/09/29 17:58:32+02:00 uni-frankfurt.de!mickeyl
fix section for mikmod and modplugplay
2004/09/29 17:12:08+02:00 uni-frankfurt.de!mickeyl
enable losetup in default busybox config
BKrev: 415adcea4UMfz2lvSSK4JcNs17Q9sQ
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/qmake-base.oeclass | 5 | ||||
| -rw-r--r-- | classes/qt3x11.oeclass | 0 |
2 files changed, 3 insertions, 2 deletions
diff --git a/classes/qmake-base.oeclass b/classes/qmake-base.oeclass index 798ad5cde0..b6890369d1 100644 --- a/classes/qmake-base.oeclass +++ b/classes/qmake-base.oeclass @@ -9,7 +9,7 @@ EXTRA_OEMAKE = ' MAKEFLAGS= ' export OE_QMAKE_CC="${CC}" export OE_QMAKE_CFLAGS="${CFLAGS}" export OE_QMAKE_CXX="${CXX}" -export OE_QMAKE_CXXFLAGS="${CXXFLAGS}" +export OE_QMAKE_CXXFLAGS="-fno-exceptions -fno-rtti ${CXXFLAGS}" export OE_QMAKE_LDFLAGS="${LDFLAGS}" export OE_QMAKE_LINK="${CCLD}" export OE_QMAKE_AR="${AR}" @@ -18,9 +18,10 @@ export OE_QMAKE_UIC="${STAGING_BINDIR}/uic" export OE_QMAKE_MOC="${STAGING_BINDIR}/moc" export OE_QMAKE_RPATH="-Wl,-rpath-link," -# default to QTDIR +# default to qte2 via oe.conf, inherit qt3x11 to configure for qt3x11 export OE_QMAKE_INCDIR_QT="${QTDIR}/include" export OE_QMAKE_LIBDIR_QT="${QTDIR}/lib" +export OE_QMAKE_LIBS_QT="qte" oe_qmake_mkspecs () { mkdir -p mkspecs/${OE_QMAKE_PLATFORM} diff --git a/classes/qt3x11.oeclass b/classes/qt3x11.oeclass new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/classes/qt3x11.oeclass |