summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2010-03-03 10:01:34 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2010-03-03 10:01:34 +0000
commitbb594646aa89e7a67c7b6ce07b7169d604073073 (patch)
tree392566ac055a958d1f3202881093546f970d3a1c /meta
parentc02ea00db1c98f86cf33bb83e866055225da86b1 (diff)
downloadpoky-bb594646aa89e7a67c7b6ce07b7169d604073073.tar.gz
eds-dbus: Disable parallel make build problem
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
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 0000000000..4cf6b1a356
--- /dev/null
+++ b/meta/packages/eds/eds-dbus/parallelmake.patch
@@ -0,0 +1,21 @@
1Index: git/git.mk
2===================================================================
3--- git.orig/git.mk 2010-02-05 14:57:15.000000000 +0000
4+++ git/git.mk 2010-03-03 09:31:43.000000000 +0000
5@@ -166,11 +166,11 @@
6
7 all: $(srcdir)/.gitignore gitignore-recurse
8 gitignore-recurse:
9- @if test "x$(SUBDIRS)" = "x$(DIST_SUBDIRS)"; then :; else \
10- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
11- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) .gitignore); \
12- done; \
13- fi;
14+ #@if test "x$(SUBDIRS)" = "x$(DIST_SUBDIRS)"; then :; else \
15+ # list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
16+ # test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) .gitignore); \
17+ # done; \
18+ #fi;
19 maintainer-clean: gitignore-clean
20 gitignore-clean:
21 -rm -f $(srcdir)/.gitignore
diff --git a/meta/packages/eds/eds-dbus_git.bb b/meta/packages/eds/eds-dbus_git.bb
index fc04bad294..033fa889ce 100644
--- a/meta/packages/eds/eds-dbus_git.bb
+++ b/meta/packages/eds/eds-dbus_git.bb
@@ -3,11 +3,12 @@ LICENSE = "LGPL"
3DEPENDS = "intltool-native glib-2.0 gtk+ gconf dbus db gnome-common virtual/libiconv zlib libsoup-2.4 libglade libical gnome-keyring" 3DEPENDS = "intltool-native glib-2.0 gtk+ gconf dbus db gnome-common virtual/libiconv zlib libsoup-2.4 libglade libical gnome-keyring"
4 4
5PV = "2.29+git${SRCPV}" 5PV = "2.29+git${SRCPV}"
6PR = "r3" 6PR = "r4"
7 7
8SRC_URI = "git://git.gnome.org/evolution-data-server;protocol=git \ 8SRC_URI = "git://git.gnome.org/evolution-data-server;protocol=git \
9 file://oh-contact.patch;patch=1;pnum=0 \ 9 file://oh-contact.patch;patch=1;pnum=0 \
10 file://nossl.patch;patch=1 \ 10 file://nossl.patch;patch=1 \
11 file://parallelmake.patch;patch=1 \
11 file://iconv-detect.h" 12 file://iconv-detect.h"
12 13
13S = "${WORKDIR}/git" 14S = "${WORKDIR}/git"