Commit f87cbf0e authored by Simon Dawson's avatar Simon Dawson Committed by Peter Korsgaard
Browse files

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: default avatarSimon Dawson <spdawson@gmail.com>
Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent 43329076
Loading
Loading
Loading
Loading
+25 −0
Original line number Diff line number Diff line
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