summaryrefslogtreecommitdiff
path: root/meta
diff options
context:
space:
mode:
authorJoshua Lock <josh@linux.intel.com>2010-12-15 12:58:09 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2010-12-16 17:36:01 +0000
commit3f64aed210daee4439f8595bb3f0f68f0a8e577b (patch)
tree058ae5c0d3bc94ac34f70a64c5dc570a4f75678c /meta
parent3188c6aa0f7cc26d7157f1be5a17b7b30194c5cd (diff)
downloadopenembedded-core-3f64aed210daee4439f8595bb3f0f68f0a8e577b.tar.gz
openembedded-core-3f64aed210daee4439f8595bb3f0f68f0a8e577b.tar.bz2
openembedded-core-3f64aed210daee4439f8595bb3f0f68f0a8e577b.zip
dates: fix for Make 3.82
Signed-off-by: Joshua Lock <josh@linux.intel.com>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-sato/pimlico/dates/make-382.patch16
-rw-r--r--meta/recipes-sato/pimlico/dates_git.bb5
2 files changed, 19 insertions, 2 deletions
diff --git a/meta/recipes-sato/pimlico/dates/make-382.patch b/meta/recipes-sato/pimlico/dates/make-382.patch
new file mode 100644
index 0000000000..9147361261
--- /dev/null
+++ b/meta/recipes-sato/pimlico/dates/make-382.patch
@@ -0,0 +1,16 @@
+Make 3.82 is offended by the use of spaces instead of tabs. This has been fixed
+in upstream git.
+
+JL - 15/12/10
+
+Index: git/Makefile.am
+===================================================================
+--- git.orig/Makefile.am
++++ git/Makefile.am
+@@ -7,5 +7,5 @@ DISTCLEANFILES = intltool-extract intlto
+ MAINTAINERCLEANFILES = $(DISTCLEANFILES) aclocal.m4 compile config.guess config.sub configure depcomp install-sh ltmain.sh 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/dates_git.bb b/meta/recipes-sato/pimlico/dates_git.bb
index 49ca4eca86..d09f4e6216 100644
--- a/meta/recipes-sato/pimlico/dates_git.bb
+++ b/meta/recipes-sato/pimlico/dates_git.bb
@@ -6,8 +6,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
file://src/gconf-bridge.c;endline=22;md5=ad7626c6daf4aec590474a243f4912fa"
PV = "0.4.11+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"