summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/vala/vala
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2014-09-04 13:39:55 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-11-06 16:45:21 +0000
commit188873951a0c5220ab8d21a83e4adc63738803e7 (patch)
tree73be8403fb6d0517015d515bf02616fc3ced4f57 /meta/recipes-devtools/vala/vala
parent0d9a0711d3eea18512e75d091f703dfb1a9091f0 (diff)
downloadpoky-188873951a0c5220ab8d21a83e4adc63738803e7.tar.gz
vala: Update to 0.24.0
Remove un-needed PR and INC_PR Rename vala-0.16 to more geneic vala Now correctly supports seperate build/source directorys so drop -sepbuild tag (From OE-Core rev: d5624272824795b85047d8064077bc8458cbfa67) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/vala/vala')
-rw-r--r--meta/recipes-devtools/vala/vala/0001-git-version-gen-don-t-append-dirty-if-we-re-not-in-g.patch53
1 files changed, 53 insertions, 0 deletions
diff --git a/meta/recipes-devtools/vala/vala/0001-git-version-gen-don-t-append-dirty-if-we-re-not-in-g.patch b/meta/recipes-devtools/vala/vala/0001-git-version-gen-don-t-append-dirty-if-we-re-not-in-g.patch
new file mode 100644
index 0000000000..e6c7941a77
--- /dev/null
+++ b/meta/recipes-devtools/vala/vala/0001-git-version-gen-don-t-append-dirty-if-we-re-not-in-g.patch
@@ -0,0 +1,53 @@
1From 2460d7b79f7e90dcfeebde5e9c53d9b6798a1f3c Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Tue, 21 Feb 2012 17:12:50 +0100
4Subject: [PATCH] git-version-gen: don't append -dirty if we're not in git
5 repo
6
7* for example if we have some dirty directory and we unpack clean vala tarball in it, then it will append -dirty
8
9Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
10---
11 build-aux/git-version-gen | 25 ++++++++++++++-----------
12 1 files changed, 14 insertions(+), 11 deletions(-)
13
14diff --git a/build-aux/git-version-gen b/build-aux/git-version-gen
15index 0fa6faa..1d1f9d2 100755
16--- a/build-aux/git-version-gen
17+++ b/build-aux/git-version-gen
18@@ -126,18 +126,21 @@ fi
19
20 v=`echo "$v" |sed 's/^v//'`
21
22-# Don't declare a version "dirty" merely because a time stamp has changed.
23-git status > /dev/null 2>&1
24+if test -d .git
25+then
26+ # Don't declare a version "dirty" merely because a time stamp has changed.
27+ git status > /dev/null 2>&1
28
29-dirty=`sh -c 'git diff-index --name-only HEAD' 2>/dev/null` || dirty=
30-case "$dirty" in
31- '') ;;
32- *) # Append the suffix only if there isn't one already.
33- case $v in
34- *-dirty) ;;
35- *) v="$v-dirty" ;;
36- esac ;;
37-esac
38+ dirty=`sh -c 'git diff-index --name-only HEAD' 2>/dev/null` || dirty=
39+ case "$dirty" in
40+ '') ;;
41+ *) # Append the suffix only if there isn't one already.
42+ case $v in
43+ *-dirty) ;;
44+ *) v="$v-dirty" ;;
45+ esac ;;
46+ esac
47+fi
48
49 # Omit the trailing newline, so that m4_esyscmd can use the result directly.
50 echo "$v" | tr -d '\012'
51--
521.7.8.4
53