]> code.ossystems Code Review - openembedded-core.git/commitdiff
eds-dbus: Disable parallel make build problem
authorRichard Purdie <rpurdie@linux.intel.com>
Wed, 3 Mar 2010 10:01:34 +0000 (10:01 +0000)
committerRichard Purdie <rpurdie@linux.intel.com>
Wed, 3 Mar 2010 10:01:34 +0000 (10:01 +0000)
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
meta/packages/eds/eds-dbus/parallelmake.patch [new file with mode: 0644]
meta/packages/eds/eds-dbus_git.bb

diff --git a/meta/packages/eds/eds-dbus/parallelmake.patch b/meta/packages/eds/eds-dbus/parallelmake.patch
new file mode 100644 (file)
index 0000000..4cf6b1a
--- /dev/null
@@ -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
index fc04bad2947bf5e1ba38eeabffcff98540af3990..033fa889cef73f70755ed7a4bec94b82c97dc52f 100644 (file)
@@ -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"