summaryrefslogtreecommitdiffstats
path: root/openembedded/packages/eds
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2005-09-30 17:25:47 +0000
committerRichard Purdie <richard@openedhand.com>2005-09-30 17:25:47 +0000
commitfbf2ef9840e6b241d05651d8f8a26b7c0f11aa6d (patch)
treee994b75d8b7c75fb8e36aa8c1bece3c3aee808e3 /openembedded/packages/eds
parentc12545673d5b327a7f8f107fb74dfd15d4710524 (diff)
downloadpoky-fbf2ef9840e6b241d05651d8f8a26b7c0f11aa6d.tar.gz
Change db to 4.1.25, update PR's across the board
git-svn-id: https://svn.o-hand.com/repos/poky@89 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'openembedded/packages/eds')
-rw-r--r--openembedded/packages/eds/eds-dbus/external_libdb.patch6
-rwxr-xr-xopenembedded/packages/eds/eds-dbus_svn.bb4
2 files changed, 5 insertions, 5 deletions
diff --git a/openembedded/packages/eds/eds-dbus/external_libdb.patch b/openembedded/packages/eds/eds-dbus/external_libdb.patch
index ebb32403e8..50b9e9b48a 100644
--- a/openembedded/packages/eds/eds-dbus/external_libdb.patch
+++ b/openembedded/packages/eds/eds-dbus/external_libdb.patch
@@ -36,14 +36,14 @@ Index: trunk/configure.in
36 AC_SUBST(REGEX_LIBS) 36 AC_SUBST(REGEX_LIBS)
37 37
38 dnl ****************************** 38 dnl ******************************
39+dnl * db-4.3 checking 39+dnl * db-4.1 checking
40+dnl ****************************** 40+dnl ******************************
41+ 41+
42+AC_ARG_WITH(libdb43, [ --with-libdb43 Prefix where libdb 4.3 is installed]) 42+AC_ARG_WITH(libdb41, [ --with-libdb41 Prefix where libdb 4.1 is installed])
43+case $withval in 43+case $withval in
44+/*) 44+/*)
45+ DB_CFLAGS="-I$withval/include/db4" 45+ DB_CFLAGS="-I$withval/include/db4"
46+ DB_LIBS="-L$withval/lib -ldb-4.3" 46+ DB_LIBS="-L$withval/lib -ldb-4.1"
47+ ;; 47+ ;;
48+esac 48+esac
49+ 49+
diff --git a/openembedded/packages/eds/eds-dbus_svn.bb b/openembedded/packages/eds/eds-dbus_svn.bb
index 2ffa363fe2..77ea4141da 100755
--- a/openembedded/packages/eds/eds-dbus_svn.bb
+++ b/openembedded/packages/eds/eds-dbus_svn.bb
@@ -4,7 +4,7 @@ RDEPENDS = "gtk+ gconf db libiconv"
4MAINTAINER = "Chris Lord <chris@openedhand.com>" 4MAINTAINER = "Chris Lord <chris@openedhand.com>"
5DESCRIPTION = "Evolution database backend server" 5DESCRIPTION = "Evolution database backend server"
6PV = "1.4.0cvs${CVSDATE}" 6PV = "1.4.0cvs${CVSDATE}"
7PR = "r4" 7PR = "r5"
8 8
9SRC_URI = "svn://svn.o-hand.com/repos/${PN};module=trunk;proto=http \ 9SRC_URI = "svn://svn.o-hand.com/repos/${PN};module=trunk;proto=http \
10 file://external_libdb.patch;patch=1 \ 10 file://external_libdb.patch;patch=1 \
@@ -17,7 +17,7 @@ S = "${WORKDIR}/trunk"
17 17
18inherit autotools pkgconfig 18inherit autotools pkgconfig
19 19
20EXTRA_OECONF = "--without-openldap --disable-nntp --disable-gtk-doc --with-dbus=yes --with-libgnome=no --enable-soup=no --with-libdb43=${STAGING_DIR}/${HOST_SYS} --enable-smime=no --enable-nss=no --disable-camel" 20EXTRA_OECONF = "--without-openldap --disable-nntp --disable-gtk-doc --with-dbus=yes --with-libgnome=no --enable-soup=no --with-libdb41=${STAGING_DIR}/${HOST_SYS} --enable-smime=no --enable-nss=no --disable-camel"
21 21
22acpaths = " -I ${STAGING_DATADIR}/aclocal/gnome-macros " 22acpaths = " -I ${STAGING_DATADIR}/aclocal/gnome-macros "
23 23