From 258f8ceed23eda24a5d524c58a84f58df9eb75f5 Mon Sep 17 00:00:00 2001 From: Joshua Lock Date: Wed, 15 Dec 2010 13:42:15 +0000 Subject: contacts: fix for make 3.82 Signed-off-by: Joshua Lock --- meta/recipes-sato/pimlico/contacts/make-382.patch | 14 ++++++++++++++ meta/recipes-sato/pimlico/contacts_git.bb | 5 +++-- 2 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-sato/pimlico/contacts/make-382.patch (limited to 'meta/recipes-sato/pimlico') diff --git a/meta/recipes-sato/pimlico/contacts/make-382.patch b/meta/recipes-sato/pimlico/contacts/make-382.patch new file mode 100644 index 0000000000..f85d6b24fa --- /dev/null +++ b/meta/recipes-sato/pimlico/contacts/make-382.patch @@ -0,0 +1,14 @@ +Fix for stricter parser in make 3.82. This fix has been pushed to upstream git. + +JL - 15/12/10 + +Index: git/Makefile.am +=================================================================== +--- git.orig/Makefile.am ++++ git/Makefile.am +@@ -11,4 +11,4 @@ DISTCLEANFILES = $(INTLTOOL_BUILT) + MAINTAINERCLEANFILES = aclocal.m4 compile config.guess config.sub configure depcomp $(INTLTOOL_BUILT:=.in) install-sh ltmain.sh mkinstalldirs Makefile.in missing + + snapshot: +- $(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"` ++ $(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"` diff --git a/meta/recipes-sato/pimlico/contacts_git.bb b/meta/recipes-sato/pimlico/contacts_git.bb index bff4e288db..c375435309 100644 --- a/meta/recipes-sato/pimlico/contacts_git.bb +++ b/meta/recipes-sato/pimlico/contacts_git.bb @@ -6,11 +6,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ file://src/contacts-gtk.c;endline=23;md5=e1ee9b9e72045f2d3aa44cf17313b46e" PV = "0.12+git${SRCPV}" -PR = "r0" +PR = "r1" S = "${WORKDIR}/git" -SRC_URI =+ "git://git.gnome.org/${PN};protocol=git" +SRC_URI =+ "git://git.gnome.org/${PN};protocol=git \ + file://make-382.patch" S = "${WORKDIR}/git" -- cgit v1.2.3-54-g00ecf