summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Dawson <spdawson@gmail.com>2012-05-18 06:15:05 (GMT)
committer Peter Korsgaard <jacmet@sunsite.dk>2012-05-18 16:45:37 (GMT)
commitf87cbf0ed9e0efa12ee5e2ea5e81bdc217430c80 (patch)
tree883fde169cff11a40a6450071ccb2a2ee1ca0919
parent433290761fceb476b095548eec10adf72405e050 (diff)
downloadbuildroot-f87cbf0ed9e0efa12ee5e2ea5e81bdc217430c80.tar.gz
buildroot-f87cbf0ed9e0efa12ee5e2ea5e81bdc217430c80.tar.bz2
vala: do not append a -dirty suffix to the valac version number
When vala is built inside a Git repository with uncommitted changes, the valac version number has -dirty appended. This creates problems for packages (e.g. Midori) which require a valac version number without the -dirty suffix. Signed-off-by: Simon Dawson <spdawson@gmail.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--package/vala/vala-0.15.2-dont-add-dirty-to-valac-version.patch25
1 files changed, 25 insertions, 0 deletions
diff --git a/package/vala/vala-0.15.2-dont-add-dirty-to-valac-version.patch b/package/vala/vala-0.15.2-dont-add-dirty-to-valac-version.patch
new file mode 100644
index 0000000..a2a0623
--- /dev/null
+++ b/package/vala/vala-0.15.2-dont-add-dirty-to-valac-version.patch
@@ -0,0 +1,25 @@
+valac: don't append -dirty to version
+
+Don't append -dirty to the valac version number if the Buildroot Git
+tree has uncommited changes.
+
+The patched script is meant for the valac developers, but it also
+activates if you build valac in a subdirectory of a Git tree (e.g.
+as is commonly done in Buildroot).
+
+The effect is that valac gets built as being version x.y.z-dirty, which
+breaks programs (such as Midori) that explicitly check for valac-x.y.z.
+
+Signed-off-by: Simon Dawson <spdawson@gmail.com>
+diff -Nur a/build-aux/git-version-gen b/build-aux/git-version-gen
+--- a/build-aux/git-version-gen 2010-08-15 12:49:03.000000000 +0100
++++ b/build-aux/git-version-gen 2012-05-14 10:17:19.977204570 +0100
+@@ -135,7 +135,7 @@
+ *) # Append the suffix only if there isn't one already.
+ case $v in
+ *-dirty) ;;
+- *) v="$v-dirty" ;;
++ #*) v="$v-dirty" ;;
+ esac ;;
+ esac
+