From patchwork Thu Oct 11 14:15:48 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Khryukin X-Patchwork-Id: 190918 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 4C0EE2C007B for ; Fri, 12 Oct 2012 01:16:11 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 92148A0034; Thu, 11 Oct 2012 14:16:10 +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 M6FddTXs1988; Thu, 11 Oct 2012 14:16:08 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 1D430A00B0; Thu, 11 Oct 2012 14:16:08 +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 61DB88F74A for ; Thu, 11 Oct 2012 14:16:09 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 9CD8F81D53 for ; Thu, 11 Oct 2012 14:16:06 +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 gd0UvYoOJbnT for ; Thu, 11 Oct 2012 14:16:05 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail.mezon.ru (mail.mezon.ru [188.127.253.33]) by whitealder.osuosl.org (Postfix) with ESMTP id B6D9E841B1 for ; Thu, 11 Oct 2012 14:16:04 +0000 (UTC) Received: from localhost (localhost.localdomain [127.0.0.1]) by mail.mezon.ru (Postfix) with ESMTP id CFF4D1CD757 for ; Thu, 11 Oct 2012 18:16:03 +0400 (MSK) X-Virus-Scanned: amavisd-new at mezon.ru Received: from mail.mezon.ru ([127.0.0.1]) by localhost (stream2.mezon.ru [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 3DJyAMkYsHZF for ; Thu, 11 Oct 2012 18:16:03 +0400 (MSK) Received: from gate-obit.mezon.ru (gate-obit.mezon.ru [37.77.135.198]) by mail.mezon.ru (Postfix) with ESMTP id 003831CD70E for ; Thu, 11 Oct 2012 18:16:02 +0400 (MSK) Received: from [192.168.0.206] (fdkit.mezon.lan [192.168.0.206]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by gate-obit.mezon.ru (Postfix) with ESMTP id DD477D70027 for ; Thu, 11 Oct 2012 18:16:02 +0400 (MSK) Message-ID: <1349964948.28555.8.camel@localhost> From: Alexander Khryukin To: buildroot@busybox.net Date: Thu, 11 Oct 2012 18:15:48 +0400 Organization: mezon.ru X-Mailer: Evolution 3.2.3 Mime-Version: 1.0 Subject: [Buildroot] [PATCH] autoconf version update 2.69 and patch rediff X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list Reply-To: alexander@mezon.ru List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net Signed-off-by: Alexander Khryukin --- .../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 \