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
This commit is contained in:
parent
c12545673d
commit
fbf2ef9840
|
@ -3,6 +3,8 @@ SECTION = "x11"
|
||||||
DEPENDS = "glib-2.0 gtk+ libglade eds-dbus"
|
DEPENDS = "glib-2.0 gtk+ libglade eds-dbus"
|
||||||
MAINTAINER = "Chris Lord <chris@openedhand.com>"
|
MAINTAINER = "Chris Lord <chris@openedhand.com>"
|
||||||
DESCRIPTION = "Contacts is an address-book application."
|
DESCRIPTION = "Contacts is an address-book application."
|
||||||
|
PR = "r1"
|
||||||
|
|
||||||
|
|
||||||
SRC_URI = "file:///tmp/${PN}-${PV}.tar.gz"
|
SRC_URI = "file:///tmp/${PN}-${PV}.tar.gz"
|
||||||
|
|
||||||
|
|
|
@ -4,6 +4,8 @@ DEPENDS = "glib-2.0 gtk+ libglade eds-dbus"
|
||||||
MAINTAINER = "Chris Lord <chris@openedhand.com>"
|
MAINTAINER = "Chris Lord <chris@openedhand.com>"
|
||||||
DESCRIPTION = "Dates is a calendar application."
|
DESCRIPTION = "Dates is a calendar application."
|
||||||
|
|
||||||
|
PR = "r1"
|
||||||
|
|
||||||
PV = "0.0cvs${CVSDATE}"
|
PV = "0.0cvs${CVSDATE}"
|
||||||
S = "${WORKDIR}/${PN}"
|
S = "${WORKDIR}/${PN}"
|
||||||
|
|
||||||
|
|
|
@ -73,17 +73,20 @@ do_stage() {
|
||||||
# Install, for the moment, into include/db4 to avoid
|
# Install, for the moment, into include/db4 to avoid
|
||||||
# interfering with the db3 headers (which have the same
|
# interfering with the db3 headers (which have the same
|
||||||
# name). -I${STAGING_INCDIR}/db4 to use db4, as opposed
|
# name). -I${STAGING_INCDIR}/db4 to use db4, as opposed
|
||||||
# to db3.
|
# to db3
|
||||||
|
|
||||||
rm -rf ${STAGE_TEMP}
|
rm -rf ${STAGE_TEMP}
|
||||||
mkdir -p ${STAGE_TEMP}
|
mkdir -p ${STAGE_TEMP}
|
||||||
oe_runmake DESTDIR="${STAGE_TEMP}" install_include
|
oe_runmake DESTDIR="${STAGE_TEMP}" includedir="${STAGE_TEMP}${includedir}" install_include
|
||||||
mkdir -p ${STAGING_INCDIR}/db4
|
mkdir -p ${STAGING_INCDIR}/db4
|
||||||
cp -pPRf ${STAGE_TEMP}/${includedir}/* ${STAGING_INCDIR}/db4
|
cp -pPRf ${STAGE_TEMP}/${includedir}/* ${STAGING_INCDIR}/db4
|
||||||
rm -rf ${STAGE_TEMP}
|
rm -rf ${STAGE_TEMP}
|
||||||
oe_libinstall -so -C .libs libdb-4.3 ${STAGING_LIBDIR}
|
oe_libinstall -so -C .libs libdb-4.1 ${STAGING_LIBDIR}
|
||||||
}
|
}
|
||||||
|
|
||||||
do_install_append() {
|
do_install() {
|
||||||
|
oe_runmake includedir="${D}${includedir}" libdir="${D}${libdir}" bindir="${D}${bindir}" docdir="${D}${docdir}" install
|
||||||
|
|
||||||
# The docs end up in /usr/docs - not right.
|
# The docs end up in /usr/docs - not right.
|
||||||
if test -d "${D}/${prefix}/docs"
|
if test -d "${D}/${prefix}/docs"
|
||||||
then
|
then
|
|
@ -36,14 +36,14 @@ Index: trunk/configure.in
|
||||||
AC_SUBST(REGEX_LIBS)
|
AC_SUBST(REGEX_LIBS)
|
||||||
|
|
||||||
dnl ******************************
|
dnl ******************************
|
||||||
+dnl * db-4.3 checking
|
+dnl * db-4.1 checking
|
||||||
+dnl ******************************
|
+dnl ******************************
|
||||||
+
|
+
|
||||||
+AC_ARG_WITH(libdb43, [ --with-libdb43 Prefix where libdb 4.3 is installed])
|
+AC_ARG_WITH(libdb41, [ --with-libdb41 Prefix where libdb 4.1 is installed])
|
||||||
+case $withval in
|
+case $withval in
|
||||||
+/*)
|
+/*)
|
||||||
+ DB_CFLAGS="-I$withval/include/db4"
|
+ DB_CFLAGS="-I$withval/include/db4"
|
||||||
+ DB_LIBS="-L$withval/lib -ldb-4.3"
|
+ DB_LIBS="-L$withval/lib -ldb-4.1"
|
||||||
+ ;;
|
+ ;;
|
||||||
+esac
|
+esac
|
||||||
+
|
+
|
||||||
|
|
|
@ -4,7 +4,7 @@ RDEPENDS = "gtk+ gconf db libiconv"
|
||||||
MAINTAINER = "Chris Lord <chris@openedhand.com>"
|
MAINTAINER = "Chris Lord <chris@openedhand.com>"
|
||||||
DESCRIPTION = "Evolution database backend server"
|
DESCRIPTION = "Evolution database backend server"
|
||||||
PV = "1.4.0cvs${CVSDATE}"
|
PV = "1.4.0cvs${CVSDATE}"
|
||||||
PR = "r4"
|
PR = "r5"
|
||||||
|
|
||||||
SRC_URI = "svn://svn.o-hand.com/repos/${PN};module=trunk;proto=http \
|
SRC_URI = "svn://svn.o-hand.com/repos/${PN};module=trunk;proto=http \
|
||||||
file://external_libdb.patch;patch=1 \
|
file://external_libdb.patch;patch=1 \
|
||||||
|
@ -17,7 +17,7 @@ S = "${WORKDIR}/trunk"
|
||||||
|
|
||||||
inherit autotools pkgconfig
|
inherit autotools pkgconfig
|
||||||
|
|
||||||
EXTRA_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"
|
EXTRA_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"
|
||||||
|
|
||||||
acpaths = " -I ${STAGING_DATADIR}/aclocal/gnome-macros "
|
acpaths = " -I ${STAGING_DATADIR}/aclocal/gnome-macros "
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,7 @@ PACKAGES = "oh-base-depends oh-task-base"
|
||||||
# oh-task-base
|
# oh-task-base
|
||||||
DESCRIPTION = "Meta-package for OpenHand Palmtop Environment"
|
DESCRIPTION = "Meta-package for OpenHand Palmtop Environment"
|
||||||
MAINTAINER = "Richard Purdie <richard@openedhand.com>"
|
MAINTAINER = "Richard Purdie <richard@openedhand.com>"
|
||||||
PR = "r11"
|
PR = "r14"
|
||||||
|
|
||||||
ALLOW_EMPTY = "1"
|
ALLOW_EMPTY = "1"
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
PR = "r6"
|
PR = "r8"
|
||||||
|
|
||||||
export IMAGE_BASENAME = "oh-image"
|
export IMAGE_BASENAME = "oh-image"
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue