From patchwork Wed Oct 2 20:21:32 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gustavo Zacarias X-Patchwork-Id: 280172 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (silver.osuosl.org [140.211.166.136]) by ozlabs.org (Postfix) with ESMTP id 40D212C008E for ; Thu, 3 Oct 2013 06:21:53 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 32C14274CE; Wed, 2 Oct 2013 20:21:52 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id wsGqF1hsP-yX; Wed, 2 Oct 2013 20:21:49 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 5213D31614; Wed, 2 Oct 2013 20:21:49 +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 EBA3F1C2AD3 for ; Wed, 2 Oct 2013 20:21:47 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id E82FB8D588 for ; Wed, 2 Oct 2013 20:21:47 +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 y31pNJROibTe for ; Wed, 2 Oct 2013 20:21:46 +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 2E6518D584 for ; Wed, 2 Oct 2013 20:21:45 +0000 (UTC) Received: from asgard (host136.190-138-193.telecom.net.ar [190.138.193.136]) (authenticated bits=0) by loknar.toptech.com.ar (8.14.7/8.14.7) with ESMTP id r92KLdRs011887 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Wed, 2 Oct 2013 20:21:41 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=zacarias.com.ar; s=dkey; t=1380745303; bh=ffT81dxqhyhruP8I7MtsV6PliKIRUpUDdnQ0jZGsz2o=; h=From:To:Cc:Subject:Date; b=agQbAHA1cXK9t504/Jg12grtpFIfyCUPEuatdJfl5v0l9LPaETAjN61JWqVoGNzqk 8RU1NwrU419YuM3lk5vFgFoRtww2lyJRqJ545T+b9I6PtXPDbD8nMI2l8p9WXCIzM3 JJWOJrLlHzFYFccRlL4RLGaoUEf8d/wABjARubSQ= Received: by asgard (sSMTP sendmail emulation); Wed, 02 Oct 2013 17:21:33 -0300 From: Gustavo Zacarias To: buildroot@busybox.net Date: Wed, 2 Oct 2013 17:21:32 -0300 Message-Id: <1380745292-9743-1-git-send-email-gustavo@zacarias.com.ar> X-Mailer: git-send-email 1.8.1.5 X-Virus-Scanned: clamav-milter 0.97.8 at loknar X-Virus-Status: Clean Subject: [Buildroot] [PATCH] bison: fix docs build breakage 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 Building docs running the binary itself to see if docs need to be changed is somewhat skippy. Disable it. Fixes: http://autobuild.buildroot.net/results/e8a/e8a960f38e66f31355af733e510002d45052b541/ Signed-off-by: Gustavo Zacarias --- package/bison/bison-01-no-docs-regen.patch | 53 ++++++++++++++++++++++++++++++ package/bison/bison.mk | 1 + 2 files changed, 54 insertions(+) create mode 100644 package/bison/bison-01-no-docs-regen.patch diff --git a/package/bison/bison-01-no-docs-regen.patch b/package/bison/bison-01-no-docs-regen.patch new file mode 100644 index 0000000..7c375d6 --- /dev/null +++ b/package/bison/bison-01-no-docs-regen.patch @@ -0,0 +1,53 @@ +bison regenerates the docs to see if they changed which requires running +the recently built bison. This obviously doesn't work for cross compiles +hence breaks for many target bison builds. +Just disable it. + +Signed-off-by: Gustavo Zacarias + +diff -Nura bison-3.0.orig/doc/local.mk bison-3.0/doc/local.mk +--- bison-3.0.orig/doc/local.mk 2013-10-02 16:52:48.711890121 -0300 ++++ bison-3.0/doc/local.mk 2013-10-02 17:14:59.329341143 -0300 +@@ -37,15 +37,6 @@ + CROSS_OPTIONS_PL = $(top_srcdir)/build-aux/cross-options.pl + CROSS_OPTIONS_TEXI = $(top_srcdir)/doc/cross-options.texi + $(CROSS_OPTIONS_TEXI): doc/bison.help $(CROSS_OPTIONS_PL) +-# Create $@~ which is the previous contents. Don't use 'mv' here so +-# that even if we are interrupted, the file is still available for +-# diff in the next run. Note that $@ might not exist yet. +- $(AM_V_GEN){ test ! -f $@ || cat $@; } >$@~ +- $(AM_V_at)test ! -f $@.tmp || rm -f $@.tmp +- $(AM_V_at)src/bison$(EXEEXT) --help | \ +- $(PERL) $(CROSS_OPTIONS_PL) $(top_srcdir)/src/scan-gram.l >$@.tmp +- $(AM_V_at)diff -u $@~ $@.tmp || true +- $(AM_V_at)mv $@.tmp $@ + MAINTAINERCLEANFILES = $(CROSS_OPTIONS_TEXI) + + ## ---------- ## +@@ -86,9 +77,6 @@ + EXTRA_DIST += $(top_srcdir)/doc/bison.help + MAINTAINERCLEANFILES += $(top_srcdir)/doc/bison.help + $(top_srcdir)/doc/bison.help: src/bison$(EXEEXT) +- $(AM_V_GEN)src/bison$(EXEEXT) --version >doc/bison.help.tmp +- $(AM_V_at) src/bison$(EXEEXT) --help >>doc/bison.help.tmp +- $(AM_V_at)$(top_srcdir)/build-aux/move-if-change doc/bison.help.tmp $@ + + + ## ----------- ## +@@ -106,16 +94,6 @@ + + # Depend on configure to get version number changes. + $(top_srcdir)/doc/bison.1: doc/bison.help doc/bison.x $(top_srcdir)/configure +- $(AM_V_GEN)$(HELP2MAN) \ +- --include=$(top_srcdir)/doc/bison.x \ +- --output=$@.t src/bison$(EXEEXT) +- $(AM_V_at)if $(remove_time_stamp) $@ >$@a.t 2>/dev/null && \ +- $(remove_time_stamp) $@.t | cmp $@a.t - >/dev/null 2>&1; then \ +- touch $@; \ +- else \ +- mv $@.t $@; \ +- fi +- $(AM_V_at)rm -f $@*.t + + nodist_man_MANS = doc/yacc.1 + diff --git a/package/bison/bison.mk b/package/bison/bison.mk index 47a7560..1bead39 100644 --- a/package/bison/bison.mk +++ b/package/bison/bison.mk @@ -11,6 +11,7 @@ BISON_LICENSE = GPLv3+ BISON_LICENSE_FILES = COPYING BISON_CONF_ENV = ac_cv_path_M4=/usr/bin/m4 BISON_DEPENDENCIES = m4 +BISON_AUTORECONF = YES define BISON_DISABLE_EXAMPLES echo 'all install:' > $(@D)/examples/Makefile