diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2004-11-28 12:20:18 +0000 |
|---|---|---|
| committer | Michael Lauer <mickey@vanille-media.de> | 2004-11-28 12:20:18 +0000 |
| commit | 7f3ba086ff54c067c83e7672feed7523d04837a3 (patch) | |
| tree | be04166fe05548b521197d0b8d1f9e5c690a805d /libopie | |
| parent | 337406cc077a53127903f9b6ff763856a663c7f2 (diff) | |
Merge bk://oe-devel@oe-devel.bkbits.net/packages
into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages
2004/11/28 03:29:12+01:00 uni-frankfurt.de!mickeyl
make zbedic 0.9.2-cvs compile
2004/11/28 02:35:32+01:00 uni-frankfurt.de!mickeyl
wellenreiter: ensure the kernel's wireless.h gets picked up
2004/11/28 02:08:52+01:00 uni-frankfurt.de!mickeyl
networkapplet: ensure the kernel's wireless.h gets picked up
2004/11/28 02:08:28+01:00 uni-frankfurt.de!mickeyl
wirelessapplet: ensure the kernel's wireless.h gets picked up
2004/11/28 01:13:16+01:00 uni-frankfurt.de!mickeyl
ship libopiobex0 in opie-image
2004/11/28 00:02:56+01:00 uni-frankfurt.de!mickeyl
make opie-networksettings pick up the kernel's wireless.h
2004/11/27 23:51:12+01:00 uni-frankfurt.de!mickeyl
make libopie pick up the kernel's wireless.h
2004/11/27 18:53:59+01:00 uni-frankfurt.de!mickeyl
make wireless-tools pick up the kernel's wireless.h
BKrev: 41a9c282CzUBHaxVZPfCILOfAoitvw
Diffstat (limited to 'libopie')
| -rw-r--r-- | libopie/libopie2_1.1.7.oe | 4 | ||||
| -rw-r--r-- | libopie/libopie2_cvs.oe | 5 |
2 files changed, 8 insertions, 1 deletions
diff --git a/libopie/libopie2_1.1.7.oe b/libopie/libopie2_1.1.7.oe index 3f6dbfdb1c..f49dc6f086 100644 --- a/libopie/libopie2_1.1.7.oe +++ b/libopie/libopie2_1.1.7.oe @@ -6,6 +6,7 @@ LICENSE = "LGPL" I18N_FILES = "libopiecore2.ts libopiesecurity2.ts" DEPENDS = "libqpe-opie sqlite3 libpcap-0.7.2 virtual/kernel" PROVIDES = "libopiecore2 libopiedb2 libopiemm2 libopiesecurity2 libopienet2 libopiepim2 libopieui2 " +PR = "r1" TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}" SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/libopie2 \ @@ -14,6 +15,9 @@ S = "${WORKDIR}/libopie2" inherit opie +# we need to pick up the kernel's wireless.h or else the WE will be broken +export OE_QMAKE_CFLAGS="-I${STAGING_KERNEL_DIR}/include ${CFLAGS}" + #FIXME: Add machine specific bits here. Best use oe_machinstall and read from a given file EXTRA_QMAKEVARS_POST = 'DEFINES+=OPIE_NEW_MALLOC \ diff --git a/libopie/libopie2_cvs.oe b/libopie/libopie2_cvs.oe index 368e03800f..48cd7040c6 100644 --- a/libopie/libopie2_cvs.oe +++ b/libopie/libopie2_cvs.oe @@ -5,7 +5,7 @@ MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" LICENSE = "LGPL" I18N_FILES = "libopiecore2.ts libopiesecurity2.ts" DEPENDS = "libqpe-opie sqlite3 libpcap-0.7.2 virtual/kernel" -PR = "r4" +PR = "r5" PROVIDES = "libopiecore2 libopiedb2 libopiemm2 libopiesecurity2 libopienet2 libopiepim2 libopieui2" PV = "1.1.7+cvs-${CVSDATE}" @@ -15,6 +15,9 @@ S = "${WORKDIR}/libopie2" inherit opie +# we need to pick up the kernel's wireless.h or else the WE will be broken +export OE_QMAKE_CFLAGS="-I${STAGING_KERNEL_DIR}/include ${CFLAGS}" + #FIXME: Add machine specific bits here. Best use oe_machinstall and read from a given file EXTRA_QMAKEVARS_POST = 'DEFINES+=OPIE_NEW_MALLOC \ |