diff options
author | Ross Burton <ross.burton@intel.com> | 2012-07-19 16:17:21 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-07-22 11:42:19 +0100 |
commit | a2afa6955fc509aac11be724c458f9283c3c11ae (patch) | |
tree | 50068a7598b3fe8eb284c1342bcffcdc841e6216 | |
parent | 7f42473ce3a4a4723e5c8b6fe84b247f387bb314 (diff) | |
download | poky-a2afa6955fc509aac11be724c458f9283c3c11ae.tar.gz |
evolution-data-server: cleanup thanks to new gtk-doc.bbclass
(From OE-Core rev: 18ef5e7d691a05565db88ffd0c13475ad9b0dcf3)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-sato/eds/evolution-data-server_git.bb | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/meta/recipes-sato/eds/evolution-data-server_git.bb b/meta/recipes-sato/eds/evolution-data-server_git.bb index 2ad81e48b1..c114c0e363 100644 --- a/meta/recipes-sato/eds/evolution-data-server_git.bb +++ b/meta/recipes-sato/eds/evolution-data-server_git.bb | |||
@@ -13,7 +13,7 @@ DEPENDS = "intltool-native glib-2.0 gtk+ gconf dbus db gnome-common virtual/libi | |||
13 | SRCREV = "3ca578d968d09785933ebbb45b66b3bccdbd5832" | 13 | SRCREV = "3ca578d968d09785933ebbb45b66b3bccdbd5832" |
14 | 14 | ||
15 | PV = "2.30+git${SRCPV}" | 15 | PV = "2.30+git${SRCPV}" |
16 | PR = "r1" | 16 | PR = "r2" |
17 | 17 | ||
18 | SRC_URI = "git://git.gnome.org/evolution-data-server;protocol=git \ | 18 | SRC_URI = "git://git.gnome.org/evolution-data-server;protocol=git \ |
19 | file://oh-contact.patch;striplevel=0 \ | 19 | file://oh-contact.patch;striplevel=0 \ |
@@ -28,7 +28,7 @@ SRC_URI = "git://git.gnome.org/evolution-data-server;protocol=git \ | |||
28 | 28 | ||
29 | S = "${WORKDIR}/git" | 29 | S = "${WORKDIR}/git" |
30 | 30 | ||
31 | inherit autotools pkgconfig | 31 | inherit autotools gtk-doc pkgconfig |
32 | 32 | ||
33 | # -ldb needs this on some platforms | 33 | # -ldb needs this on some platforms |
34 | LDFLAGS += "-lpthread" | 34 | LDFLAGS += "-lpthread" |
@@ -38,10 +38,6 @@ LDFLAGS += "-lpthread" | |||
38 | # directories by make resulting in truncated/corrupt .la files | 38 | # directories by make resulting in truncated/corrupt .la files |
39 | #PARALLEL_MAKE = "" | 39 | #PARALLEL_MAKE = "" |
40 | 40 | ||
41 | do_configure_prepend () { | ||
42 | echo "EXTRA_DIST = " > ${S}/gtk-doc.make | ||
43 | } | ||
44 | |||
45 | do_configure_append () { | 41 | do_configure_append () { |
46 | cp ${WORKDIR}/iconv-detect.h ${S} | 42 | cp ${WORKDIR}/iconv-detect.h ${S} |
47 | sed -i 's/-DG_DISABLE_DEPRECATED//g' ${S}/libedataserver/Makefile | 43 | sed -i 's/-DG_DISABLE_DEPRECATED//g' ${S}/libedataserver/Makefile |
@@ -49,7 +45,7 @@ do_configure_append () { | |||
49 | 45 | ||
50 | EXTRA_OECONF = "--without-openldap --with-dbus --without-bug-buddy \ | 46 | EXTRA_OECONF = "--without-openldap --with-dbus --without-bug-buddy \ |
51 | --with-soup --with-libdb=${STAGING_DIR_HOST}${prefix} \ | 47 | --with-soup --with-libdb=${STAGING_DIR_HOST}${prefix} \ |
52 | --disable-smime --disable-ssl --disable-nntp --disable-gtk-doc --without-weather" | 48 | --disable-smime --disable-ssl --disable-nntp --without-weather" |
53 | 49 | ||
54 | PACKAGES =+ "libcamel libcamel-dev libebook libebook-dev libecal libecal-dev \ | 50 | PACKAGES =+ "libcamel libcamel-dev libebook libebook-dev libecal libecal-dev \ |
55 | libedata-book libedata-book-dev libedata-cal libedata-cal-dev \ | 51 | libedata-book libedata-book-dev libedata-cal libedata-cal-dev \ |