diff options
| author |   Joshua Lock <josh@linux.intel.com> | 2010-12-15 13:42:15 +0000 |
|---|---|---|
| committer |   Richard Purdie <rpurdie@linux.intel.com> | 2010-12-16 17:36:01 +0000 |
| commit | 258f8ceed23eda24a5d524c58a84f58df9eb75f5 (patch) | |
| tree | 1116f08cafd7fee2a590ef0d764cabf00a84038d /meta/recipes-sato | |
| parent | 3f64aed210daee4439f8595bb3f0f68f0a8e577b (diff) | |
| download | openembedded-core-contrib-258f8ceed23eda24a5d524c58a84f58df9eb75f5.tar.gz | |
contacts: fix for make 3.82
Signed-off-by: Joshua Lock <josh@linux.intel.com>
Diffstat (limited to 'meta/recipes-sato')
| -rw-r--r-- | meta/recipes-sato/pimlico/contacts/make-382.patch | 14 | ||||
| -rw-r--r-- | meta/recipes-sato/pimlico/contacts_git.bb | 5 |
2 files changed, 17 insertions, 2 deletions
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 00000000000..f85d6b24fa9 --- /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 bff4e288db4..c375435309e 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" |