From patchwork Fri May 18 16:15:05 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Dawson X-Patchwork-Id: 160137 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id 8DA58B6FBD for ; Sat, 19 May 2012 02:15:15 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 98BCFFFD3C; Fri, 18 May 2012 16:15:14 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 9iuW5nAPwhFo; Fri, 18 May 2012 16:15:13 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id E1FF1100731; Fri, 18 May 2012 16:15:12 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 59A9C8F75B for ; Fri, 18 May 2012 16:15:12 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 42F968D147 for ; Fri, 18 May 2012 16:15:12 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Hns2zcnOpKcV for ; Fri, 18 May 2012 16:15:10 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-ee0-f43.google.com (mail-ee0-f43.google.com [74.125.83.43]) by whitealder.osuosl.org (Postfix) with ESMTPS id 3E46B8CF18 for ; Fri, 18 May 2012 16:15:10 +0000 (UTC) Received: by eeke50 with SMTP id e50so1322603eek.16 for ; Fri, 18 May 2012 09:15:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id:x-mailer; bh=XXBw7skBWDfsN7ks0uvUZwLM9KFSdEZaIsl+6TcuqCw=; b=h5SbU/t7mhuyOlMTHdpa46SqvQkZ43QkI4uR/T/XOQk2Xptlcr2tCkDKlXkfWGDE1N yXBh2YIzrIcsj9ejY8HFE1kvXF518ocn8xzyPtPYKodz7TBbEHxthaoIXRU1TQeJS9zp hp9wNNLy87HKBr8H8ROdQKJy9O8XEcrLO9SC3WtrzEywYRZqYLBzD+gxcY5wTZIyFmVb XBz97tQTqRdjuLwlVuCLW/rQkMepXi/sSdLK7S3ACrc5qHSox5YFL+U87WeBwodAsYol YX9aPgkvEg9OOtO+ZlAgb7aLcYGQKeSgg55Pnn/0Hg3O2GNkh4ioxlm07nU9SHWjSoQj QHuA== Received: by 10.213.32.201 with SMTP id e9mr265828ebd.82.1337357708246; Fri, 18 May 2012 09:15:08 -0700 (PDT) Received: from localhost.localdomain (host-78-150-204-81.as13285.net. [78.150.204.81]) by mx.google.com with ESMTPS id u10sm47683256eem.1.2012.05.18.09.15.06 (version=SSLv3 cipher=OTHER); Fri, 18 May 2012 09:15:07 -0700 (PDT) From: spdawson@gmail.com To: buildroot@busybox.net Date: Fri, 18 May 2012 17:15:05 +0100 Message-Id: <1337357705-3827-1-git-send-email-spdawson@gmail.com> X-Mailer: git-send-email 1.7.9.5 Subject: [Buildroot] [PATCH 1/2] vala: do not append a -dirty suffix to the valac version number X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net From: Simon Dawson 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 --- ...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 +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 +