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 | |
parent | 3f64aed210daee4439f8595bb3f0f68f0a8e577b (diff) | |
download | poky-258f8ceed23eda24a5d524c58a84f58df9eb75f5.tar.gz |
contacts: fix for make 3.82
Signed-off-by: Joshua Lock <josh@linux.intel.com>
-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 0000000000..f85d6b24fa --- /dev/null +++ b/meta/recipes-sato/pimlico/contacts/make-382.patch | |||
@@ -0,0 +1,14 @@ | |||
1 | Fix for stricter parser in make 3.82. This fix has been pushed to upstream git. | ||
2 | |||
3 | JL - 15/12/10 | ||
4 | |||
5 | Index: git/Makefile.am | ||
6 | =================================================================== | ||
7 | --- git.orig/Makefile.am | ||
8 | +++ git/Makefile.am | ||
9 | @@ -11,4 +11,4 @@ DISTCLEANFILES = $(INTLTOOL_BUILT) | ||
10 | MAINTAINERCLEANFILES = aclocal.m4 compile config.guess config.sub configure depcomp $(INTLTOOL_BUILT:=.in) install-sh ltmain.sh mkinstalldirs Makefile.in missing | ||
11 | |||
12 | snapshot: | ||
13 | - $(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"` | ||
14 | + $(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 \ | |||
6 | file://src/contacts-gtk.c;endline=23;md5=e1ee9b9e72045f2d3aa44cf17313b46e" | 6 | file://src/contacts-gtk.c;endline=23;md5=e1ee9b9e72045f2d3aa44cf17313b46e" |
7 | 7 | ||
8 | PV = "0.12+git${SRCPV}" | 8 | PV = "0.12+git${SRCPV}" |
9 | PR = "r0" | 9 | PR = "r1" |
10 | 10 | ||
11 | S = "${WORKDIR}/git" | 11 | S = "${WORKDIR}/git" |
12 | 12 | ||
13 | SRC_URI =+ "git://git.gnome.org/${PN};protocol=git" | 13 | SRC_URI =+ "git://git.gnome.org/${PN};protocol=git \ |
14 | file://make-382.patch" | ||
14 | 15 | ||
15 | S = "${WORKDIR}/git" | 16 | S = "${WORKDIR}/git" |
16 | 17 | ||