diff options
| author | nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net> | 2005-01-21 13:40:17 +0000 |
|---|---|---|
| committer | nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net> | 2005-01-21 13:40:17 +0000 |
| commit | e0a191e234aebe57a84143f2b0bf170236a77f37 (patch) | |
| tree | c0115b8ec012f2c68dead00484cb238ac9cebc47 /packages/kdepimpi | |
| parent | b8f88822e375f2228652ea332257574b7c7784f5 (diff) | |
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded
2005/01/21 14:13:30+01:00 local!hrw
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded/
into marcinj.local:/home/hrw/zaurus/bb/openembedded
2005/01/21 14:13:06+01:00 local!hrw
justreader: fix Settings file location (really fix #204)
2005/01/21 14:11:29+01:00 (none)!koen
patch to libpcap to fix dsniff build, courtesy Bob Davies
2005/01/21 14:10:18+01:00 local!hrw
transition from libstdc++ to libsupc++
Basically it allow us to drop libstdc++ dependency from some programs.
Binaries are getting little bigger but don't depend on ~3.5MiB library.
If your package fails during linking you have to add one line to it's .bb file:
export OE_QMAKE_LINK="${CXX}"
2005/01/21 14:02:44+01:00 local!hrw
we already have freedroid in meta-opie - it's in task-qpe-games as it is not from OPIE
2005/01/21 14:01:28+01:00 local!hrw
disabled PARALLEL_MAKE for uae and zroadmap
2005/01/21 11:38:29+01:00 local!hrw
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded/
into marcinj.local:/home/hrw/zaurus/bb/openembedded
2005/01/18 18:53:19+01:00 hrw.one.pl!hrw
disable PARALLEL_MAKE for opie-tinykate
BKrev: 41f106415qu3LUbzxrhFJByjZfa8pQ
Diffstat (limited to 'packages/kdepimpi')
| -rw-r--r-- | packages/kdepimpi/kdepimpi-base.inc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/packages/kdepimpi/kdepimpi-base.inc b/packages/kdepimpi/kdepimpi-base.inc index cccbe7727d..8702419b4e 100644 --- a/packages/kdepimpi/kdepimpi-base.inc +++ b/packages/kdepimpi/kdepimpi-base.inc @@ -33,10 +33,10 @@ file://libkcal.pro.patch;patch=1 \ # kabc/plugins/opie - wants libopie1 (we don't plan to have it in OE) # kmicromail - have to check changes in KDEPIM/PI version libmailwrapper - +PARALLEL_MAKE = "" S = "${WORKDIR}/kdepim" EXTRA_QMAKEVARS_POST += "KDEPIMDIR=${S} INCLUDEPATH+=../ OBJECTS_DIR=obj/ MOC_DIR=moc/ \ - LIBS+=-L${S}/dest/ DESTDIR=${S}/dest LIBS+=-lstdc++ \ + LIBS+=-L${S}/dest/ DESTDIR=${S}/dest LIBS+=-lsupc++ \ LIBS+=-Wl,-rpath-link,${S}/dest \ LIBS-=-lzlib LIBS+=-lz \ " @@ -47,7 +47,7 @@ EXTRA_QMAKEVARS_POST += "KDEPIMDIR=${S} INCLUDEPATH+=../ OBJECTS_DIR=obj/ MOC_DI QMAKE_PROFILES= "all.pro" SUBDIRS="libical/src/libical libical/src/libicalss microkde libkcal libkdepim \ - kabc korganizer kalarmd kaddressbook kabc/plugins/file kabc/plugins/dir \ + kabc korganizer kalarmd kaddressbook kabc/plugins/file kabc/plugins/dir \ kabc/formats/binary kabc/plugins/qtopia \ gammu/emb/common \ gammu/emb/gammu \ |