summaryrefslogtreecommitdiff
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/packages/eds/eds-dbus/parallelmake.patch21
-rw-r--r--meta/packages/eds/eds-dbus_git.bb3
2 files changed, 23 insertions, 1 deletions
diff --git a/meta/packages/eds/eds-dbus/parallelmake.patch b/meta/packages/eds/eds-dbus/parallelmake.patch
new file mode 100644
index 000000000..4cf6b1a35
--- /dev/null
+++ b/meta/packages/eds/eds-dbus/parallelmake.patch
@@ -0,0 +1,21 @@
+Index: git/git.mk
+===================================================================
+--- git.orig/git.mk 2010-02-05 14:57:15.000000000 +0000
++++ git/git.mk 2010-03-03 09:31:43.000000000 +0000
+@@ -166,11 +166,11 @@
+
+ all: $(srcdir)/.gitignore gitignore-recurse
+ gitignore-recurse:
+- @if test "x$(SUBDIRS)" = "x$(DIST_SUBDIRS)"; then :; else \
+- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) .gitignore); \
+- done; \
+- fi;
++ #@if test "x$(SUBDIRS)" = "x$(DIST_SUBDIRS)"; then :; else \
++ # list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
++ # test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) .gitignore); \
++ # done; \
++ #fi;
+ maintainer-clean: gitignore-clean
+ gitignore-clean:
+ -rm -f $(srcdir)/.gitignore
diff --git a/meta/packages/eds/eds-dbus_git.bb b/meta/packages/eds/eds-dbus_git.bb
index fc04bad29..033fa889c 100644
--- a/meta/packages/eds/eds-dbus_git.bb
+++ b/meta/packages/eds/eds-dbus_git.bb
@@ -3,11 +3,12 @@ LICENSE = "LGPL"
DEPENDS = "intltool-native glib-2.0 gtk+ gconf dbus db gnome-common virtual/libiconv zlib libsoup-2.4 libglade libical gnome-keyring"
PV = "2.29+git${SRCPV}"
-PR = "r3"
+PR = "r4"
SRC_URI = "git://git.gnome.org/evolution-data-server;protocol=git \
file://oh-contact.patch;patch=1;pnum=0 \
file://nossl.patch;patch=1 \
+ file://parallelmake.patch;patch=1 \
file://iconv-detect.h"
S = "${WORKDIR}/git"