From patchwork Fri May 11 13:33:59 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gustavo Zacarias X-Patchwork-Id: 158517 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 E0BBCB7012 for ; Fri, 11 May 2012 23:34:44 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 9F23E1004DE; Fri, 11 May 2012 13:34:43 +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 tbi6Lv8GQcVY; Fri, 11 May 2012 13:34:38 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 2811710B94A; Fri, 11 May 2012 13:34:27 +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 122038F78D for ; Fri, 11 May 2012 13:34:26 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 0BFA789764 for ; Fri, 11 May 2012 13:34: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 hcoOwO8pwpH3 for ; Fri, 11 May 2012 13:34:25 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from loknar.toptech.com.ar (loknar.toptech.com.ar [74.118.36.95]) by whitealder.osuosl.org (Postfix) with ESMTPS id E29A085603 for ; Fri, 11 May 2012 13:34:24 +0000 (UTC) Received: from asgard (host105.190-136-216.telecom.net.ar [190.136.216.105]) (authenticated bits=0) by loknar.toptech.com.ar (8.14.4/8.14.4) with ESMTP id q4BDYKWd027187 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 11 May 2012 10:34:22 -0300 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=zacarias.com.ar; s=dkey; t=1336743263; bh=Y0OZY6QewAo4Z5n04X2sq8d4yGNDGs4jOtRyzcBvj80=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References; b=oVQ33vX7s8oMmxuskym3Xe7t8SSNEQmK6MvT6Hhj1N6v2y5/Tq9pGgwto6F8j08+p nvbj6e44RSQAuf8MRpUaFFnZd/E5r+zb7RrDsTafla6T3B96KZweV7Wsx5IKZipnHZ ei78Ko4b6fQ3OdpbNOUpDQ5+K47YZQ1vC9eKpwso= Received: by asgard (sSMTP sendmail emulation); Fri, 11 May 2012 10:34:19 -0300 From: Gustavo Zacarias To: buildroot@busybox.net Date: Fri, 11 May 2012 10:33:59 -0300 Message-Id: <1336743239-6368-5-git-send-email-gustavo@zacarias.com.ar> X-Mailer: git-send-email 1.7.3.4 In-Reply-To: <1336743239-6368-1-git-send-email-gustavo@zacarias.com.ar> References: <1336743239-6368-1-git-send-email-gustavo@zacarias.com.ar> X-Virus-Scanned: clamav-milter 0.97.3 at loknar X-Virus-Status: Clean Subject: [Buildroot] [PATCH 5/5] openocd: fix breakage with newer autotools 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 --- package/openocd/openocd-0006-automake-compat.patch | 40 ++++++++++++++++++++ 1 files changed, 40 insertions(+), 0 deletions(-) create mode 100644 package/openocd/openocd-0006-automake-compat.patch diff --git a/package/openocd/openocd-0006-automake-compat.patch b/package/openocd/openocd-0006-automake-compat.patch new file mode 100644 index 0000000..cdc6c92 --- /dev/null +++ b/package/openocd/openocd-0006-automake-compat.patch @@ -0,0 +1,40 @@ +Backport from openocd commit 737a52d7b22b1774acc5d20f9bd25000a70ac116 +Fix for automake 1.11.2+ + +Signed-off-by: Gustavo Zacarias + +diff -Nura openocd-0.5.0/src/jtag/drivers/Makefile.am openocd-0.5.0.automake/src/jtag/drivers/Makefile.am +--- openocd-0.5.0/src/jtag/drivers/Makefile.am 2011-08-09 02:34:19.000000000 -0300 ++++ openocd-0.5.0.automake/src/jtag/drivers/Makefile.am 2012-05-01 13:57:01.007561480 -0300 +@@ -5,7 +5,8 @@ + libocdjtagdrivers_la_SOURCES = \ + $(DRIVERFILES) + +-nobase_dist_pkglib_DATA = ++ocddatadir = $(pkglibdir) ++nobase_dist_ocddata_DATA = + + ULINK_FIRMWARE = $(srcdir)/OpenULINK + +@@ -64,7 +65,7 @@ + endif + if ULINK + DRIVERFILES += ulink.c +-nobase_dist_pkglib_DATA += $(ULINK_FIRMWARE)/ulink_firmware.hex ++nobase_dist_ocddata_DATA += $(ULINK_FIRMWARE)/ulink_firmware.hex + endif + if VSLLINK + DRIVERFILES += vsllink.c +diff -Nura openocd-0.5.0/src/target/Makefile.am openocd-0.5.0.automake/src/target/Makefile.am +--- openocd-0.5.0/src/target/Makefile.am 2011-08-09 02:34:19.000000000 -0300 ++++ openocd-0.5.0.automake/src/target/Makefile.am 2012-05-01 13:57:01.934567076 -0300 +@@ -165,7 +165,7 @@ + avr32_mem.h \ + avr32_regs.h + +-nobase_dist_pkglib_DATA = +-nobase_dist_pkglib_DATA += ecos/at91eb40a.elf ++ocddatadir = $(pkglibdir) ++nobase_dist_ocddata_DATA = ecos/at91eb40a.elf + + MAINTAINERCLEANFILES = $(srcdir)/Makefile.in