From patchwork Sat Jun 29 11:06:45 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gustavo Zacarias X-Patchwork-Id: 255730 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 223AD2C008C for ; Sat, 29 Jun 2013 21:07:31 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 2F99FA027F; Sat, 29 Jun 2013 11:07:26 +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 jgmGn5SAKJnF; Sat, 29 Jun 2013 11:07:24 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id E31ADA011B; Sat, 29 Jun 2013 11:07:23 +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 314478F7AC for ; Sat, 29 Jun 2013 11:07:34 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id DC00B8AB06 for ; Sat, 29 Jun 2013 11:07:26 +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 AbIN1M0CNQvI for ; Sat, 29 Jun 2013 11:07:09 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from loknar.toptech.com.ar (loknar.toptech.com.ar [78.46.79.162]) by whitealder.osuosl.org (Postfix) with ESMTPS id 625208ABBB for ; Sat, 29 Jun 2013 11:06:55 +0000 (UTC) Received: from asgard (host74.190-225-100.telecom.net.ar [190.225.100.74]) (authenticated bits=0) by loknar.toptech.com.ar (8.14.7/8.14.7) with ESMTP id r5TB6lTX012287 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Sat, 29 Jun 2013 11:06:50 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=zacarias.com.ar; s=dkey; t=1372504012; bh=gsI4iUBzvktTzL8hXPMdQBY2371rwUWyZpid/8bTbV8=; h=From:To:Cc:Subject:Date; b=bE/RBZy8cflGlHC7NGaM0fpTOscy5lE7MrmdBHw5ks9cyUh6ZEUb9/hQ7HdgfzmIz pWvmeL2APkSJdPkpjKjX3rg9RB1YFKfO6GBHJKTn0kudQDp5uKjgfMGKkOpZJ6WAPv TUfM6DG44pdEvQetbPPqrP1UIEDU2Cu/3y97BrH8= Received: by asgard (sSMTP sendmail emulation); Sat, 29 Jun 2013 08:06:46 -0300 From: Gustavo Zacarias To: buildroot@busybox.net Date: Sat, 29 Jun 2013 08:06:45 -0300 Message-Id: <1372504006-627-1-git-send-email-gustavo@zacarias.com.ar> X-Mailer: git-send-email 1.8.1.5 X-Virus-Scanned: clamav-milter 0.97.7 at loknar X-Virus-Status: Clean Subject: [Buildroot] [PATCH 1/2] autoconf: bump to version 2.69 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 Signed-off-by: Gustavo Zacarias --- .../autoconf-dont-add-dirty-to-version.patch | 30 ++++++++++------------ package/autoconf/autoconf.mk | 2 +- 2 files changed, 15 insertions(+), 17 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..e8d9f6a 100644 --- a/package/autoconf/autoconf-dont-add-dirty-to-version.patch +++ b/package/autoconf/autoconf-dont-add-dirty-to-version.patch @@ -10,21 +10,19 @@ commonly done in buildroot). The affect is that autoconf gets built as being version 2.65-dirty, which breaks programs (like Python) which explicitly checks for autoconf-2.65. +[Gustavo: update for autoconf 2.69] Signed-off-by: Peter Korsgaard ---- - build-aux/git-version-gen | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) +Signed-off-by: Gustavo Zacarias -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 -Nura autoconf-2.69.orig/build-aux/git-version-gen autoconf-2.69/build-aux/git-version-gen +--- autoconf-2.69.orig/build-aux/git-version-gen 2013-06-27 11:31:02.340200154 -0300 ++++ autoconf-2.69/build-aux/git-version-gen 2013-06-27 11:31:13.734577033 -0300 +@@ -203,7 +203,7 @@ + *) # 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 bc6f65f..2482552 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_LICENSE = GPLv3+ with exceptions