Skip to contentSkip to conversation

vala: do not append a -dirty suffix to the valac version number

PATCH New spdawson at gmail.com 2 participants 2 messages May 18, 2012

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 vala: do not append a -dirty suffix to the valac version number

From: Simon Dawson <[email protected]>

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.

---
 ...la-0.15.2-dont-add-dirty-to-valac-version.patch |   25 ++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 package/vala/vala-0.15.2-dont-add-dirty-to-valac-version.patch
package/vala/vala-0.15.2-dont-add-dirty-to-valac-version.patch new file +25 -0
new file mode 100644
index 0000000..a2a0623
@@ -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 <[email protected]>
+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
+ 
Signature · 1 line
1.7.9.5
#1 lore raw

PATCH 1/2 vala: do not append a -dirty suffix to the valac version number

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"spdawson" == spdawson <[email protected]> writes:

spdawson> From: Simon Dawson <[email protected]>
spdawson> When vala is built inside a Git repository with uncommitted changes, the spdawson> valac version number has -dirty appended. This creates problems for spdawson> packages (e.g. Midori) which require a valac version number without spdawson> the -dirty suffix.

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard