From patchwork Thu Oct 11 15:08:22 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Khryukin X-Patchwork-Id: 190922 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id E6E2F2C0082 for ; Fri, 12 Oct 2012 02:04:36 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 84513A022E; Thu, 11 Oct 2012 15:04:35 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 1-AXAZCGLcEW; Thu, 11 Oct 2012 15:04:34 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 39A53A005E; Thu, 11 Oct 2012 15:04:34 +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 DBECE8F74A for ; Thu, 11 Oct 2012 15:04:34 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 18BB288CAE for ; Thu, 11 Oct 2012 15:04:32 +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 Lf6k5ElvkEhC for ; Thu, 11 Oct 2012 15:04:29 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-lb0-f171.google.com (mail-lb0-f171.google.com [209.85.217.171]) by whitealder.osuosl.org (Postfix) with ESMTPS id 817DB84B4E for ; Thu, 11 Oct 2012 15:04:28 +0000 (UTC) Received: by mail-lb0-f171.google.com with SMTP id m4so1658814lbo.16 for ; Thu, 11 Oct 2012 08:04:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer; bh=buoOOGUoGAk3cXBys0sjNVel5oDNtm8SIwxbFzJuxbw=; b=cMMpGibaRe9ltPqyyZlcPM+RCK1nLoFYqEBDgpACU63pQ6damTF7Oqdr7qItY1n64E mZQmkTe1Kmf31uN9iJa+xyw3pixC1Cy9BtyJwDcSkO+uArff+8ZZ9BOSa21H2o2MXR2V rXQNTiVRsF15VCy9XWAg3FIsXyg1hxXje03gd8pWRB0M1/uI3W+PVAd4ioUHFiB0mkx8 Ns8WpymAgrem8yYFiVuxjpZf54w+anpucxa8nTGugsk7Qn4QT+Z6+5qzwcwaX164pZ6F ZTTa1QmO9wn9rW4e0gfd7Ly/QQTtNXUNyvkikc10gPz9+2agVsse0PiAFig9wT8gT445 Ol3w== Received: by 10.152.124.201 with SMTP id mk9mr1074120lab.33.1349967866358; Thu, 11 Oct 2012 08:04:26 -0700 (PDT) Received: from kvm-host.mezon.local (gate-obit.mezon.ru. [37.77.135.198]) by mx.google.com with ESMTPS id s2sm1500380lbl.11.2012.10.11.08.04.25 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 11 Oct 2012 08:04:25 -0700 (PDT) From: Alexander Khryukin To: buildroot@busybox.net Date: Thu, 11 Oct 2012 15:08:22 +0000 Message-Id: <1349968102-696-1-git-send-email-alexander@mezon.ru> X-Mailer: git-send-email 1.7.11.3 Subject: [Buildroot] [PATCH] autoconf version update 2.69 and patch rediff 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 --- .../autoconf-dont-add-dirty-to-version.patch | 26 +++++++++++----------- package/autoconf/autoconf.mk | 2 +- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/package/autoconf/autoconf-dont-add-dirty-to-version.patch b/package/autoconf/autoconf-dont-add-dirty-to-version.patch index 38ac163..761ee3f 100644 --- a/package/autoconf/autoconf-dont-add-dirty-to-version.patch +++ b/package/autoconf/autoconf-dont-add-dirty-to-version.patch @@ -15,16 +15,16 @@ Signed-off-by: Peter Korsgaard build-aux/git-version-gen | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: autoconf-2.65/build-aux/git-version-gen -=================================================================== ---- autoconf-2.65.orig/build-aux/git-version-gen -+++ autoconf-2.65/build-aux/git-version-gen -@@ -135,7 +135,7 @@ case "$dirty" in - *) # Append the suffix only if there isn't one already. - case $v in - *-dirty) ;; -- *) v="$v-dirty" ;; -+ #*) v="$v-dirty" ;; - esac ;; - esac - +diff --git a/build-aux/git-version-gen b/build-aux/git-version-gen +index 0fa9063..14cd4f8 100755 +--- a/build-aux/git-version-gen ++++ b/build-aux/git-version-gen +@@ -203,7 +203,7 @@ if test -n "$v_from_git"; then + *) # Append the suffix only if there isn't one already. + case $v in + *-dirty) ;; +- *) v="$v-dirty" ;; ++ #*) v="$v-dirty" ;; + esac ;; + esac + fi diff --git a/package/autoconf/autoconf.mk b/package/autoconf/autoconf.mk index 3f84e3e..f659c9f 100644 --- a/package/autoconf/autoconf.mk +++ b/package/autoconf/autoconf.mk @@ -4,7 +4,7 @@ # ############################################################# -AUTOCONF_VERSION = 2.68 +AUTOCONF_VERSION = 2.69 AUTOCONF_SITE = $(BR2_GNU_MIRROR)/autoconf AUTOCONF_CONF_ENV = EMACS="no" ac_cv_path_M4=$(HOST_DIR)/usr/bin/m4 \