aboutsummaryrefslogtreecommitdiffstats
path: root/nonworking
diff options
context:
space:
mode:
authorGreg Gilbert <greg@treke.net>2004-08-20 21:58:31 +0000
committerGreg Gilbert <greg@treke.net>2004-08-20 21:58:31 +0000
commit67109d736e7fc54ab119d17edc0306806b70b9ae (patch)
tree35f90a5072282ff675325d650b7ce24f4c633a44 /nonworking
parente17cc5368cc13424f1626f3d635ff1e4c8d7d217 (diff)
downloadopenembedded-67109d736e7fc54ab119d17edc0306806b70b9ae.tar.gz
konqueror-embedded_20030705.oe:
Revert back to autotools class to make sure host libs arent included. The call to admin/am_edit fixes the missing moc and uic calls. BKrev: 41267407azUYAqJXQisEVIp733JonA
Diffstat (limited to 'nonworking')
-rw-r--r--nonworking/konqueror/konqueror-embedded_20030705.oe44
1 files changed, 10 insertions, 34 deletions
diff --git a/nonworking/konqueror/konqueror-embedded_20030705.oe b/nonworking/konqueror/konqueror-embedded_20030705.oe
index bf54447bf2..431bbc5978 100644
--- a/nonworking/konqueror/konqueror-embedded_20030705.oe
+++ b/nonworking/konqueror/konqueror-embedded_20030705.oe
@@ -4,11 +4,13 @@ PRIORITY="optional"
LICENSE="GPL"
SRC_URI = http://devel-home.kde.org/~hausmann/snapshots/konqueror-embedded-snapshot-${PV}.tar.gz \
- file://${FILESDIR}/opie1.patch;patch=1
+ file://${FILESDIR}/opie1.patch;patch=1 \
+ file://${FILESDIR}/pro.patch;patch=1 \
+ file://${FILESDIR}/packing.patch;patch=1
S = "${WORKDIR}/konqueror-embedded-snapshot-${PV}"
-inherit libtool
+inherit autotools libtool
FILES=
FILES_${PN}=/opt/QtPalmtop
@@ -18,36 +20,10 @@ QMAKESPEC=${QMAKE_MKSPEC_PATH}/qws/${TARGET_OS}-${TARGET_ARCH}-g++
EXTRA_QMAKEVARS_POST = "QMAKE_UIC=${STAGING_BINDIR}/uic QMAKE_MOC=${STAGING_BINDIR}/moc QMAKE_RPATH=-Wl,-rpath-link,"
-do_configure () {
- ./configure \
- --build=${BUILD_SYS} \
- --host=${HOST_SYS} \
- --target=${TARGET_SYS} \
- --prefix=${prefix} \
- --exec_prefix=${exec_prefix} \
- --bindir=${bindir} \
- --sbindir=${sbindir} \
- --libexecdir=${libexecdir} \
- --datadir=${datadir} \
- --sysconfdir=${sysconfdir} \
- --sharedstatedir=${sharedstatedir} \
- --localstatedir=${localstatedir} \
- --libdir=${libdir} \
- --includedir=${includedir} \
- --oldincludedir=${oldincludedir} \
- --infodir=${infodir} \
- --mandir=${mandir} \
- --enable-static \
- --disable-shared \
- --disable-debug \
- --enable-qpe \
- --enable-embedded \
- --with-extra-includes=${STAGING_INCDIR} \
- --with-extra-libs=${STAGING_LIBDIR} \
- --with-ssl-version=0.9.7c \
- --with-ssl-dir=${STAGING_DIR}/target \
- --with-qtopia-dir=${STAGING_DIR}/target \
- --prefix=/opt/QtPalmtop \
- --with-javascript=static
-
+EXTRA_OECONF = --enable-static --disable-shared --disable-debug --enable-qpe --enable-embedded \
+ --with-extra-includes=${STAGING_INCDIR} --with-extra-libs=${STAGING_LIBDIR} --with-ssl-version=0.9.7c \
+ --with-ssl-dir=${STAGING_DIR}/target --with-qtopia-dir=${STAGING_DIR}/target --prefix=/opt/QtPalmtop --with-javascript=static
+CXXFLAGS+=" -DOPIE_NO_ERASE_RECT_FIX -dOPIE_NEW_MALLOC"
+do_compile_prepend() {
+ perl admin/am_edit
}