All of lore.kernel.org
 help / color / mirror / Atom feed
From: spdawson at gmail.com <spdawson@gmail.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 1/2] vala: do not append a -dirty suffix to the valac version number
Date: Fri, 18 May 2012 17:15:05 +0100	[thread overview]
Message-ID: <1337357705-3827-1-git-send-email-spdawson@gmail.com> (raw)

From: Simon Dawson <spdawson@gmail.com>

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>
---
 ...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

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
+ 
-- 
1.7.9.5

             reply	other threads:[~2012-05-18 16:15 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-05-18 16:15 spdawson at gmail.com [this message]
2012-05-18 16:47 ` [Buildroot] [PATCH 1/2] vala: do not append a -dirty suffix to the valac version number Peter Korsgaard
  -- strict thread matches above, loose matches on Subject: below --
2012-05-16 12:10 spdawson at gmail.com
2012-05-18  8:44 ` Peter Korsgaard
2012-05-18 13:06   ` Simon Dawson
2012-05-18 14:57     ` Peter Korsgaard

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1337357705-3827-1-git-send-email-spdawson@gmail.com \
    --to=spdawson@gmail.com \
    --cc=buildroot@busybox.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.